Expande the compiler to fully build and zip plugins linked to components. Added plugin_updates area. Fixed gh-454 to insure placeholders are build even if no local db placeholders are found. Fixed gh-453 to prevent count error with null return value.

README.md

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.35) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.36) 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)
 
@@ -146,14 +146,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th August, 2019
++ *Last Build*: 8th August, 2019
-+ *Version*: 2.9.35
++ *Version*: 2.9.36
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **242379**
++ *Line count*: **245973**
-+ *Field count*: **1302**
++ *Field count*: **1319**
-+ *File count*: **1566**
++ *File count*: **1594**
-+ *Folder count*: **240**
++ *Folder count*: **244**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.35) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.36) 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)
 
@@ -146,14 +146,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th August, 2019
++ *Last Build*: 8th August, 2019
-+ *Version*: 2.9.35
++ *Version*: 2.9.36
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **242379**
++ *Line count*: **245973**
-+ *Field count*: **1302**
++ *Field count*: **1319**
-+ *File count*: **1566**
++ *File count*: **1594**
-+ *Folder count*: **240**
++ *Folder count*: **244**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/access.xml

@@ -353,6 +353,16 @@
 		<action name="joomla_plugin_files_folders_urls.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_STATE_DESC" />
 		<action name="joomla_plugin_files_folders_urls.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_VERSION_DESC" />
 		<action name="joomla_plugin.submenu" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU_DESC" />
+		<action name="joomla_plugin_updates.access" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS_DESC" />
+		<action name="joomla_plugin_updates.batch" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE_DESC" />
+		<action name="joomla_plugin_updates.create" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE_DESC" />
+		<action name="joomla_plugin_updates.delete" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE_DESC" />
+		<action name="joomla_plugin_updates.edit" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_DESC" />
+		<action name="joomla_plugin_updates.edit.created_by" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY_DESC" />
+		<action name="joomla_plugin_updates.edit.created" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE_DESC" />
+		<action name="joomla_plugin_updates.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN_DESC" />
+		<action name="joomla_plugin_updates.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC" />
+		<action name="joomla_plugin_updates.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC" />
 		<action name="language.build" title="COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC" />
 		<action name="language_translation.access" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC" />
 		<action name="language_translation.batch" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC" />
@@ -905,6 +915,17 @@
 	<section name="joomla_plugin_group">
 		<action name="joomla_plugin_group.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_EDIT_VERSION_DESC" />
 	</section>
+	<section name="joomla_plugin_updates">
+		<action name="joomla_plugin_updates.edit" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_DESC" />
+		<action name="joomla_plugin_updates.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN_DESC" />
+		<action name="joomla_plugin_updates.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC" />
+		<action name="joomla_plugin_updates.edit.created_by" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY_DESC" />
+		<action name="joomla_plugin_updates.edit.created" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE_DESC" />
+		<action name="joomla_plugin_updates.create" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE_DESC" />
+		<action name="joomla_plugin_updates.delete" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE_DESC" />
+		<action name="joomla_plugin_updates.access" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS_DESC" />
+		<action name="joomla_plugin_updates.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC" />
+	</section>
 	<section name="joomla_plugin_files_folders_urls">
 		<action name="joomla_plugin_files_folders_urls.edit" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_DESC" />
 		<action name="joomla_plugin_files_folders_urls.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_OWN_DESC" />

admin/assets/css/joomla_plugin_updates.css

@@ -0,0 +1,15 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+
+.mysql_update { width: 100%; height: 392px; }
+.version_url { min-width: 100%; }

admin/assets/css/joomla_plugins_updates.css

@@ -0,0 +1,13 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* CSS Document */
+
+

admin/compiler/joomla_3/script.php

@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -25,21 +25,27 @@ JHTML::_('behavior.modal');
 class com_###component###InstallerScript
 {
 	/**
-	 * method to install the component
+	 * Constructor
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
 	 */
-	function install($parent)
+	public function __construct(JAdapterInstance $parent) {}
-	{
-
-	}
 
 	/**
-	 * method to uninstall the component
+	 * Called on installation
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function uninstall($parent)
+	public function install(JAdapterInstance $parent) {}
+
+	/**
+	 * Called on uninstallation
+	 *
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 */
+	public function uninstall(JAdapterInstance $parent)
 	{###UNINSTALLSCRIPT###
 		// little notice as after service, in case of bad experience with component.
 		echo '<h2>Did something go wrong? Are you disappointed?</h2>
@@ -50,62 +56,69 @@ class com_###component###InstallerScript
 	}
 
 	/**
-	 * method to update the component
+	 * Called on update
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function update($parent)
+	public function update(JAdapterInstance $parent){}
-	{
-		
-	}
 
 	/**
-	 * method to run before an install/update/uninstall method
+	 * Called before any type of action
 	 *
-	 * @return void
+	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function preflight($type, $parent)
+	public function preflight($type, JAdapterInstance $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();
-		// is redundant ...hmmm
+		// is redundant or so it seems ...hmmm let me know if it works again
-		if ($type == 'uninstall')
+		if ($type === 'uninstall')
 		{
 			return true;
 		}
 		// the default for both install and update
 		$jversion = new JVersion();
-		if (!$jversion->isCompatible('3.6.0'))
+		if (!$jversion->isCompatible('3.8.0'))
 		{
-			$app->enqueueMessage('Please upgrade to at least Joomla! 3.6.0 before continuing!', 'error');
+			$app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');
 			return false;
 		}
 		// do any updates needed
-		if ($type == 'update')
+		if ($type === 'update')
 		{###PREUPDATESCRIPT###
 		}
 		// do any install needed
-		if ($type == 'install')
+		if ($type === 'install')
 		{###PREINSTALLSCRIPT###
 		}
+		return true;
 	}
 
 	/**
-	 * method to run after an install/update/uninstall method
+	 * Called after any type of action
 	 *
-	 * @return void
+	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function postflight($type, $parent)
+	public function postflight($type, JAdapterInstance $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();###MOVEFOLDERSSCRIPT###
 		// set the default component settings
-		if ($type == 'install')
+		if ($type === 'install')
 		{###POSTINSTALLSCRIPT###
 		}
 		// do any updates needed
-		if ($type == 'update')
+		if ($type === 'update')
 		{###POSTUPDATESCRIPT###
 		}
+		return true;
 	}###MOVEFOLDERSMETHOD###
 }

admin/compiler/joomla_3/vdm.php

@@ -0,0 +1,32 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+###VDM_ENCRYPTION_BODY###

admin/controller.php

@@ -131,6 +131,7 @@ class ComponentbuilderController extends JControllerLegacy
 				'library_files_folders_urls' => 'libraries_files_folders_urls',
 				'class_extends' => 'class_extendings',
 				'joomla_plugin_group' => 'joomla_plugin_groups',
+				'joomla_plugin_updates' => 'joomla_plugins_updates',
 				'joomla_plugin_files_folders_urls' => 'joomla_plugins_files_folders_urls'
 					);
 			// check if this is a list view

admin/controllers/compiler.php

@@ -77,9 +77,9 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 			if (empty($redirect_url) && $componentId > 0)
 			{
 				$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
-				if (($pos = strpos($model->compiler->filepath, "/tmp/")) !== FALSE)
+				if (($pos = strpos($model->compiler->filepath['component'], "/tmp/")) !== FALSE)
 				{
-				    $url = JURI::root() . substr($model->compiler->filepath, $pos + 1);
+				    $url = JURI::root() . substr($model->compiler->filepath['component'], $pos + 1);
 				}
 				// Message of successful build
 				$message = '<h1>The ('.$model->compiler->componentFolderName.') Was Successfully Compiled!</h1>';
@@ -101,7 +101,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 				$message .= '<small>(if creating a folder and file took <b>5 seconds</b> and writing one line of code took <b>10 seconds</b>, with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)</small></p>';
 				$message .= '<p>Project duration: <b>'.$model->compiler->projectWeekTime. ' weeks</b> or <b>'.$model->compiler->projectMonthTime.' months</b></p>';
 				$message .= '<h2>Path to Zip File</h2>';
-				$message .= '<p><b>Path:</b> <code>'.$model->compiler->filepath.'</code><br />';
+				$message .= '<p><b>Path:</b> <code>'.$model->compiler->filepath['component'].'</code><br />';
 				$message .= '<b>URL:</b> <code>'.$url.'</code><br /><br />';
 				$message .= '<small>Hey! you can also download the file right now!</small><br /><a class="btn btn-success" href="'.$url.'" ><span class="icon-download icon-white"></span>Download</a></p>';
 				$message .= '<p><small><b>Remember!</b> This file is in your tmp folder and therefore publicly accessible untill you click [Clear tmp]!</small> </p>';

admin/controllers/joomla_plugin.php

@@ -315,6 +315,32 @@ class ComponentbuilderControllerJoomla_plugin extends JControllerForm
 	 */
 	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
+		// get the state object (Joomla\CMS\Object\CMSObject)
+		$state = $model->get('state');
+		// if we save2copy we need to also copy linked tables found!
+		if ($state->task === 'save2copy' && $state->{'joomla_plugin.new'})
+		{
+			// get new ID
+			$newID = $state->{'joomla_plugin.id'};
+			// get old ID
+			$oldID = $this->input->get('id', 0, 'INT');
+			// linked tables to update
+			$_tablesArray = array(
+				'joomla_plugin_updates' => 'joomla_plugin',
+				'joomla_plugin_files_folders_urls' => 'joomla_plugin'
+			);
+			foreach($_tablesArray as $_updateTable => $_key)
+			{
+				// get the linked ID
+				if ($_value = ComponentbuilderHelper::getVar($_updateTable, $oldID, $_key, 'id'))
+				{
+					// copy fields to new linked table
+					ComponentbuilderHelper::copyItem(/*id->*/ $_value, /*table->*/ $_updateTable, /*change->*/ array($_key => $newID));
+				}
+			}
+		}
+
+
 		return;
 	}
 

admin/controllers/joomla_plugin_updates.php

@@ -0,0 +1,339 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Joomla_plugin_updates Controller
+ */
+class ComponentbuilderControllerJoomla_plugin_updates extends JControllerForm
+{
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 * @note   Replaces _task.
+	 */
+	protected $task;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		$this->view_list = 'Joomla_plugins_updates'; // safeguard for setting the return view listing to the main view.
+		parent::__construct($config);
+	}
+
+        /**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		// Get user object.
+		$user = JFactory::getUser();
+		// Access check.
+		$access = $user->authorise('joomla_plugin_updates.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+
+		// In the absense of better information, revert to the component permissions.
+		return $user->authorise('joomla_plugin_updates.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// get user object.
+		$user = JFactory::getUser();
+		// get record id.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('joomla_plugin_updates.access', 'com_componentbuilder.joomla_plugin_updates.' . (int) $recordId) &&  $user->authorise('joomla_plugin_updates.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('joomla_plugin_updates.edit', 'com_componentbuilder.joomla_plugin_updates.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('joomla_plugin_updates.edit.own', 'com_componentbuilder.joomla_plugin_updates.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('joomla_plugin_updates.edit.own', 'com_componentbuilder'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('joomla_plugin_updates.edit', $this->option);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
+
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+		// set the referral options
+		if ($refid && $ref)
+                {
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		}
+		elseif ($ref)
+		{
+			$append = '&ref='. (string)$ref . $append;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Joomla_plugin_updates', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function cancel($key = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		$cancel = parent::cancel($key);
+
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $cancel;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
+		{
+			// to make sure the item is checkedin on redirect
+			$this->task = 'save';
+		}
+
+		$saved = parent::save($key, $urlVar);
+
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $saved;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   JModel  &$model     The data model object.
+	 * @param   array   $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		// update the component version to match the updated last version
+		if (isset($validData['joomla_plugin']) && is_numeric($validData['joomla_plugin']) && $validData['joomla_plugin'] > 0)
+		{
+			$objectUpdate = new stdClass();
+			$objectUpdate->id = (int) $validData['joomla_plugin'];
+			if (isset($validData['version_update']) && ComponentbuilderHelper::checkArray($validData['version_update'])
+				&& ($plugin_version = end($validData['version_update'])['version'])
+				&& ComponentbuilderHelper::checkString($plugin_version))
+			{
+				$objectUpdate->plugin_version = $plugin_version;
+			}
+			// be sure to update the table if we have a value
+			if (isset($objectUpdate->plugin_version))
+			{
+				JFactory::getDbo()->updateObject('#__componentbuilder_joomla_plugin', $objectUpdate, 'id');
+			}
+		}
+
+		return;
+	}
+
+}

admin/controllers/joomla_plugins_updates.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Joomla_plugins_updates Controller
+ */
+class ComponentbuilderControllerJoomla_plugins_updates extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Joomla_plugin_updates', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}

admin/helpers/compiler.php

@@ -35,7 +35,7 @@ class Compiler extends Infusion
 	private $time_start;
 	private $time_end;
 	public $secondsCompiled;
-	public $filepath = '';
+	public $filepath = array('component' => '', 'package' => '', 'plugins' => array(), 'modules' => array());
 	// fixed pathes
 	protected $dynamicIntegration = false;
 	protected $backupPath = false;
@@ -61,6 +61,7 @@ class Compiler extends Infusion
 				$this->backupPath = $this->params->get('backup_folder_path', $this->tempPath) . '/' . $this->componentBackupName . '.zip';
 				$this->dynamicIntegration = true;
 			}
+			// set local repos switch
 			if ($config['repository'])
 			{
 				$this->repoPath = $this->params->get('git_folder_path', null);
@@ -125,12 +126,16 @@ class Compiler extends Infusion
 			$this->setCountingStuff();
 			// build read me
 			$this->buildReadMe();
+			// set local repos
+			$this->setLocalRepos();
 			// zip the component
 			if (!$this->zipComponent())
 			{
 				// done with error
 				return false;
 			}
+			// if there are plugins zip them
+			$this->zipPlugins();
 			// do lang mismatch check
 			if (ComponentbuilderHelper::checkArray($this->langMismatch))
 			{
@@ -321,17 +326,37 @@ class Compiler extends Infusion
 	 */
 	protected function setUpdateServer()
 	{
-		// move the update server to host
+		// move the component update server to host
-		if ($this->componentData->add_update_server == 1 && $this->componentData->update_server_target == 1 && isset($this->updateServerFileName) && $this->dynamicIntegration)
+		if ($this->componentData->add_update_server == 1 && $this->componentData->update_server_target == 1
+			&& isset($this->updateServerFileName) && $this->dynamicIntegration)
 		{
-			$xml_update_server_path = $this->componentPath . '/' . $this->updateServerFileName . '.xml';
+			$update_server_xml_path = $this->componentPath . '/' . $this->updateServerFileName . '.xml';
 			// make sure we have the correct file
-			if (JFile::exists($xml_update_server_path) && isset($this->componentData->update_server))
+			if (JFile::exists($update_server_xml_path) && isset($this->componentData->update_server))
 			{
 				// move to server
-				ComponentbuilderHelper::moveToServer($xml_update_server_path, $this->updateServerFileName . '.xml', (int) $this->componentData->update_server, $this->componentData->update_server_protocol);
+				ComponentbuilderHelper::moveToServer($update_server_xml_path, $this->updateServerFileName . '.xml', (int) $this->componentData->update_server, $this->componentData->update_server_protocol);
 				// remove the local file
-				JFile::delete($xml_update_server_path);
+				JFile::delete($update_server_xml_path);
+			}
+		}
+		// move the plugins update server to host
+		if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+		{
+			foreach ($this->componentData->joomla_plugins as $plugin)
+			{
+				if (ComponentbuilderHelper::checkObject($plugin)
+					&& isset($plugin->add_update_server) && $plugin->add_update_server == 1
+					&& isset($plugin->update_server_target) && $plugin->update_server_target == 1
+					&& isset($plugin->update_server) && is_numeric($plugin->update_server) && $plugin->update_server > 0
+					&& isset($plugin->update_server_xml_path) && JFile::exists($plugin->update_server_xml_path)
+					&& isset($plugin->update_server_xml_file_name) && ComponentbuilderHelper::checkString($plugin->update_server_xml_file_name))
+				{
+					// move to server
+					ComponentbuilderHelper::moveToServer($plugin->update_server_xml_path, $plugin->update_server_xml_file_name, (int) $plugin->update_server, $plugin->update_server_protocol);
+					// remove the local file
+					JFile::delete($plugin->update_server_xml_path);
+				}
 			}
 		}
 	}
@@ -472,10 +497,10 @@ class Compiler extends Infusion
 		$this->fileContentStatic[$this->hhh . 'projectMonthTime' . $this->hhh] = $this->projectMonthTime;
 	}
 
-	private function zipComponent()
+	private function setLocalRepos()
 	{
-		// before we zip the component we first need to move it to the repo folder if set
+		// move it to the repo folder if set
-		if (ComponentbuilderHelper::checkString($this->repoPath))
+		if (isset($this->repoPath) && ComponentbuilderHelper::checkString($this->repoPath))
 		{
 			// set the repo path
 			$repoFullPath = $this->repoPath . '/com_' . $this->componentData->sales_name . '__joomla_' . $this->joomlaVersion;
@@ -487,21 +512,47 @@ class Compiler extends Infusion
 			JFolder::copy($this->componentPath, $repoFullPath, '', true);
 			// Trigger Event: jcb_ce_onAfterUpdateRepo
 			$this->triggerEvent('jcb_ce_onAfterUpdateRepo', array(&$this->componentContext, &$this->componentPath, &$repoFullPath, &$this->componentData));
+
+			// move the plugins to local folder repos
+			if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+			{
+				foreach ($this->componentData->joomla_plugins as $plugin)
+				{
+					if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->file_name))
+					{
+						$plugin_context = 'plugin.' . $plugin->file_name . '.' . $plugin->id;
+						// set the repo path
+						$repoFullPath = $this->repoPath . '/' . $plugin->folder_name . '__joomla_' . $this->joomlaVersion;
+						// Trigger Event: jcb_ce_onBeforeUpdateRepo
+						$this->triggerEvent('jcb_ce_onBeforeUpdateRepo', array(&$plugin_context, &$plugin->folder_path, &$repoFullPath, &$plugin));
+						// remove old data
+						$this->removeFolder($repoFullPath, $this->componentData->toignore);
+						// set the new data
+						JFolder::copy($plugin->folder_path, $repoFullPath, '', true);
+						// Trigger Event: jcb_ce_onAfterUpdateRepo
+						$this->triggerEvent('jcb_ce_onAfterUpdateRepo', array(&$plugin_context, &$plugin->folder_path, &$repoFullPath, &$plugin));
 					}
+				}
+			}
+		}
+	}
+
+	private function zipComponent()
+	{
 		// the name of the zip file to create
-		$this->filepath = $this->tempPath . '/' . $this->componentFolderName . '.zip';
+		$this->filepath['component'] = $this->tempPath . '/' . $this->componentFolderName . '.zip';
 		// Trigger Event: jcb_ce_onBeforeZipComponent
-		$this->triggerEvent('jcb_ce_onBeforeZipComponent', array(&$this->componentContext, &$this->componentPath, &$this->filepath, &$this->tempPath, &$this->componentFolderName, &$this->componentData));
+		$this->triggerEvent('jcb_ce_onBeforeZipComponent', array(&$this->componentContext, &$this->componentPath, &$this->filepath['component'], &$this->tempPath, &$this->componentFolderName, &$this->componentData));
 		//create the zip file
-		if (ComponentbuilderHelper::zip($this->componentPath, $this->filepath))
+		if (ComponentbuilderHelper::zip($this->componentPath, $this->filepath['component']))
 		{
 			// now move to backup if zip was made and backup is required
 			if ($this->backupPath && $this->dynamicIntegration)
 			{
 				// Trigger Event: jcb_ce_onBeforeBackupZip
-				$this->triggerEvent('jcb_ce_onBeforeBackupZip', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->backupPath, &$this->componentData));
+				$this->triggerEvent('jcb_ce_onBeforeBackupZip', array(&$this->componentContext, &$this->filepath['component'], &$this->tempPath, &$this->backupPath, &$this->componentData));
 				// copy the zip to backup path
-				JFile::copy($this->filepath, $this->backupPath);
+				JFile::copy($this->filepath['component'], $this->backupPath);
 			}
 
 			// move to sales server host
@@ -511,13 +562,13 @@ class Compiler extends Infusion
 				if (isset($this->componentData->sales_server))
 				{
 					// Trigger Event: jcb_ce_onBeforeMoveToServer
-					$this->triggerEvent('jcb_ce_onBeforeMoveToServer', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->componentSalesName, &$this->componentData));
+					$this->triggerEvent('jcb_ce_onBeforeMoveToServer', array(&$this->componentContext, &$this->filepath['component'], &$this->tempPath, &$this->componentSalesName, &$this->componentData));
 					// move to server
-					ComponentbuilderHelper::moveToServer($this->filepath, $this->componentSalesName . '.zip', (int) $this->componentData->sales_server, $this->componentData->sales_server_protocol);
+					ComponentbuilderHelper::moveToServer($this->filepath['component'], $this->componentSalesName . '.zip', (int) $this->componentData->sales_server, $this->componentData->sales_server_protocol);
 				}
 			}
 			// Trigger Event: jcb_ce_onAfterZipComponent
-			$this->triggerEvent('jcb_ce_onAfterZipComponent', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->componentFolderName, &$this->componentData));
+			$this->triggerEvent('jcb_ce_onAfterZipComponent', array(&$this->componentContext, &$this->filepath['component'], &$this->tempPath, &$this->componentFolderName, &$this->componentData));
 			// remove the component folder since we are done
 			if ($this->removeFolder($this->componentPath))
 			{
@@ -527,6 +578,58 @@ class Compiler extends Infusion
 		return false;
 	}
 
+	private function zipPlugins()
+	{
+		if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
+		{
+			foreach ($this->componentData->joomla_plugins as $plugin)
+			{
+				if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->zip_name)
+					&& ComponentbuilderHelper::checkString($plugin->zip_name)
+					&& isset($plugin->folder_path)
+					&& ComponentbuilderHelper::checkString($plugin->folder_path))
+				{
+					// set plugin context
+					$plugin_context = $plugin->file_name . '.' . $plugin->id;
+					// the name of the zip file to create
+					$this->filepath['plugins'][$plugin->id] = $this->tempPath . '/' . $plugin->zip_name . '.zip';
+					// Trigger Event: jcb_ce_onBeforeZipPlugin
+					$this->triggerEvent('jcb_ce_onBeforeZipPlugin', array(&$plugin_context, &$plugin->folder_path, &$this->filepath['plugins'][$plugin->id], &$this->tempPath, &$plugin->zip_name, &$plugin));
+					//create the zip file
+					if (ComponentbuilderHelper::zip($plugin->folder_path, $this->filepath['plugins'][$plugin->id]))
+					{
+						// now move to backup if zip was made and backup is required
+						if ($this->backupPath)
+						{
+							$__plugin_context = 'plugin.' . $plugin_context;
+							// Trigger Event: jcb_ce_onBeforeBackupZip
+							$this->triggerEvent('jcb_ce_onBeforeBackupZip', array(&$__plugin_context, &$this->filepath['plugins'][$plugin->id], &$this->tempPath, &$this->backupPath, &$plugin));
+							// copy the zip to backup path
+							JFile::copy($this->filepath['plugins'][$plugin->id], $this->backupPath);
+						}
+
+						// move to sales server host
+						if ($plugin->add_sales_server == 1)
+						{
+							// make sure we have the correct file
+							if (isset($plugin->sales_server))
+							{
+								// Trigger Event: jcb_ce_onBeforeMoveToServer
+								$this->triggerEvent('jcb_ce_onBeforeMoveToServer', array(&$__plugin_context, &$this->filepath['plugins'][$plugin->id], &$this->tempPath, &$plugin->zip_name, &$plugin));
+								// move to server
+								ComponentbuilderHelper::moveToServer($this->filepath['plugins'][$plugin->id], $plugin->zip_name . '.zip', (int) $plugin->sales_server, $plugin->sales_server_protocol);
+							}
+						}
+						// Trigger Event: jcb_ce_onAfterZipPlugin
+						$this->triggerEvent('jcb_ce_onAfterZipPlugin', array(&$plugin_context, &$this->filepath['plugins'][$plugin->id], &$this->tempPath, &$plugin->zip_name, &$plugin));
+						// remove the plugin folder since we are done
+						$this->removeFolder($plugin->folder_path);
+					}
+				}
+			}
+		}
+	}
+
 	protected function addCustomCode()
 	{
 		// reset all these

admin/helpers/compiler/a_Get.php

@@ -18,6 +18,13 @@ defined('_JEXEC') or die('Restricted access');
 class Get
 {
 
+	/**
+	 * The Joomla Version
+	 * 
+	 * @var     string
+	 */
+	public $joomlaVersion;
+
 	/**
 	 * The hash placeholder
 	 * 
@@ -769,6 +776,8 @@ class Get
 					}
 				}
 			}
+			// set the Joomla version
+			$this->joomlaVersion = $config['version'];
 			// set the minfy switch of the JavaScript
 			$this->minify = (isset($config['minify']) && $config['minify'] != 2) ? $config['minify'] : $this->params->get('minify', 0);
 			// set the global language
@@ -950,6 +959,7 @@ class Get
 			{
 				$code = base64_decode($code);
 			}
+		}
 		// set component place holders
 		$bucket[$this->hhh . 'component' . $this->hhh] = $this->componentCodeName;
 		$bucket[$this->hhh . 'Component' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentCodeName, 'F');
@@ -970,7 +980,6 @@ class Get
 				}
 			}
 		}
-		}
 		return $bucket;
 	}
 
@@ -6170,10 +6179,13 @@ class Get
 					'e.head',
 					'e.comment',
 					'e.id',
-				'j.addfiles',
+					'f.addfiles',
-				'j.addfolders',
+					'f.addfolders',
-				'j.addfilesfullpath',
+					'f.addfilesfullpath',
-				'j.addfoldersfullpath'
+					'f.addfoldersfullpath',
+					'f.addurls',
+					'u.version_update',
+					'u.id'
 				), array(
 					'group',
 					'extends',
@@ -6183,7 +6195,11 @@ class Get
 					'addfiles',
 					'addfolders',
 					'addfilesfullpath',
-				'addfoldersfullpath'
+					'addfoldersfullpath',
+					'addurls',
+					'version_update',
+					'version_update_id'
+					
 				)
 			)
 		);
@@ -6191,7 +6207,8 @@ class Get
 		$query->from('#__componentbuilder_joomla_plugin AS a');
 		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_joomla_plugin_group', 'g') . ' ON (' . $this->db->quoteName('a.joomla_plugin_group') . ' = ' . $this->db->quoteName('g.id') . ')');
 		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_class_extends', 'e') . ' ON (' . $this->db->quoteName('a.class_extends') . ' = ' . $this->db->quoteName('e.id') . ')');
-		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_joomla_plugin_files_folders_urls', 'j') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('j.joomla_plugin') . ')');
+		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_joomla_plugin_updates', 'u') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('u.joomla_plugin') . ')');
+		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_joomla_plugin_files_folders_urls', 'f') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('f.joomla_plugin') . ')');
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 		$query->where($this->db->quoteName('a.published') . ' >= 1');
 		$this->db->setQuery($query);
@@ -6210,8 +6227,11 @@ class Get
 			// update to point to plugin
 			$this->target = $plugin->key;
 			$this->lang = $plugin->key;
-			// set version
+			// set version if not set
-			$plugin->version = '1.0.' . (int) $plugin->version; // (TODO) add versioning to plugin
+			if (empty($plugin->plugin_version))
+			{
+				$plugin->plugin_version = '1.0.0';
+			}
 			// set GUI mapper
 			$guiMapper = array( 'table' => 'joomla_plugin', 'id' => (int) $id, 'type' => 'php');
 			// update the name if it has dynamic values
@@ -6228,6 +6248,8 @@ class Get
 			$plugin->installer_class_name = 'plg' . ucfirst($plugin->group) . ucfirst($plugin->name) . 'InstallerScript';
 			// set plugin folder name
 			$plugin->folder_name = 'plg_' . strtolower($plugin->group) . '_' . strtolower($plugin->name);
+			// set the zip name
+			$plugin->zip_name = $plugin->folder_name . '_v' . str_replace('.', '_', $plugin->plugin_version). '__J' . $this->joomlaVersion;
 			// set plugin file name
 			$plugin->file_name = strtolower($plugin->name);
 			// set official_name lang strings
@@ -6242,7 +6264,7 @@ class Get
 				$this->setLangContent($plugin->key, $plugin->lang_prefix . '_DESCRIPTION', $plugin->description);
 				$plugin->description = '<p>' . $plugin->description . '</p>';
 			}
-			$plugin->xml_description = "<h1>" . $plugin->official_name . " (v." . $plugin->version . ")</h1> <div style='clear: both;'></div>" . $plugin->description . "<p>Created by <a href='" . trim($component->website) . "' target='_blank'>" . trim(JFilterOutput::cleanText($component->author)) . "</a><br /><small>Development started " . JFactory::getDate($plugin->created)->format("jS F, Y") . "</small></p>";
+			$plugin->xml_description = "<h1>" . $plugin->official_name . " (v." . $plugin->plugin_version . ")</h1> <div style='clear: both;'></div>" . $plugin->description . "<p>Created by <a href='" . trim($component->website) . "' target='_blank'>" . trim(JFilterOutput::cleanText($component->author)) . "</a><br /><small>Development started " . JFactory::getDate($plugin->created)->format("jS F, Y") . "</small></p>";
 			// set xml discription
 			$this->setLangContent($plugin->key, $plugin->lang_prefix . '_XML_DESCRIPTION', $plugin->xml_description);
 			// update the readme if set
@@ -6307,14 +6329,15 @@ class Get
 			$plugin->fields = (isset($plugin->fields) && ComponentbuilderHelper::checkJson($plugin->fields)) ? json_decode($plugin->fields, true) : null;
 			if (ComponentbuilderHelper::checkArray($plugin->fields))
 			{
-				$plugin->config_fields = array_map(function($field) use ($id){
+				$key = $plugin->key;
+				$plugin->config_fields = array_map(function($field) use ($key){
 					// make sure the alias and title is 0
 					$field['alias'] = 0;
 					$field['title'] = 0;
 					// set the field details
-					$this->setFieldDetails($field, '_plugin_' . $id);
+					$this->setFieldDetails($field, $key);
 					// set unique name counter
-					$this->setUniqueNameCounter($field['base_name'], '_plugins_' . $id);
+					$this->setUniqueNameCounter($field['base_name'], $key);
 					// return field
 					return $field;
 				}, array_values($plugin->fields));
@@ -6323,7 +6346,7 @@ class Get
 				foreach ($plugin->config_fields as $field)
 				{
 					// so first we lock the field name in
-					$this->getFieldName($field, '_plugins_' . $id);
+					$this->getFieldName($field, $plugin->key);
 				}
 				// unset original value
 				unset($plugin->fields);
@@ -6420,6 +6443,10 @@ class Get
 					$plugin->{$server . '_protocol'} = 0;
 				}
 			}
+			// set the update server stuff (TODO)
+			// update_server_xml_path
+			// update_server_xml_file_name
+
 			// rest globals
 			$this->target = $_backup_target;
 			$this->lang = $_backup_lang;
@@ -6447,10 +6474,11 @@ class Get
 		$xml .= PHP_EOL . $this->_t(1) . '<authorUrl>' . $this->hhh . 'AUTHORWEBSITE' . $this->hhh . '</authorUrl>';
 		$xml .= PHP_EOL . $this->_t(1) . '<copyright>' . $this->hhh . 'COPYRIGHT' . $this->hhh . '</copyright>';
 		$xml .= PHP_EOL . $this->_t(1) . '<license>' . $this->hhh . 'LICENSE' . $this->hhh . '</license>';
-		$xml .= PHP_EOL . $this->_t(1) . '<version>' . $plugin->version . '</version>';
+		$xml .= PHP_EOL . $this->_t(1) . '<version>' . $plugin->plugin_version . '</version>';
 		$xml .= PHP_EOL . $this->_t(1) . '<description>' . $plugin->lang_prefix . '_XML_DESCRIPTION</description>';
 		$xml .= $this->hhh . 'MAINXML' . $this->hhh;
 		$xml .= PHP_EOL . '</extension>';
+		$dates = array();
 
 		return $xml;
 	}

admin/helpers/compiler/b_Structure.php

@@ -200,13 +200,6 @@ class Structure extends Get
 	 */
 	public $projectMonthTime = 0;
 
-	/**
-	 * The Joomla Version
-	 * 
-	 * @var     string
-	 */
-	public $joomlaVersion;
-
 	/**
 	 * The template path
 	 * 
@@ -242,6 +235,13 @@ class Structure extends Get
 	 */
 	public $stdFolders = array('site', 'admin', 'media');
 
+	/**
+	 * The standard root files
+	 * 
+	 * @var      array
+	 */
+	public $stdRootFiles = array('access.xml', 'config.xml', 'controller.php', 'index.html', 'README.txt');
+
 	/**
 	 * Dynamic File Content
 	 * 
@@ -341,6 +341,8 @@ class Structure extends Get
 		// first we run the perent constructor
 		if (parent::__construct($config))
 		{
+			// set the standard admin file
+			$this->stdRootFiles[] = $this->componentData->name_code . '.php';
 			// set incase no extra admin folder are loaded
 			$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] = '';
 			// set incase no extra site folder are loaded
@@ -355,8 +357,6 @@ class Structure extends Get
 			$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FILES' . $this->hhh] = '';
 			// run global updater
 			ComponentbuilderHelper::runGlobalUpdater();
-			// set the Joomla version
-			$this->joomlaVersion = $config['version'];
 			// set the template path
 			$this->templatePath = $this->compilerPath . '/joomla_' . $config['version'];
 			// set some default names
@@ -430,7 +430,8 @@ class Structure extends Get
 			$this->triggerEvent('jcb_ce_onBeforeSetPlugins', array(&$this->componentContext, &$this->componentData->joomla_plugins));
 			foreach ($this->componentData->joomla_plugins as $plugin)
 			{
-				if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->folder_name) && ComponentbuilderHelper::checkString($plugin->folder_name))
+				if (ComponentbuilderHelper::checkObject($plugin) && isset($plugin->folder_name)
+					&& ComponentbuilderHelper::checkString($plugin->folder_name))
 				{
 					// plugin path
 					$plugin->folder_path = $this->compilerPath . '/' . $plugin->folder_name;
@@ -447,13 +448,20 @@ class Structure extends Get
 						$this->indexHTML($plugin->folder_name, $this->compilerPath);
 					}
 					// set main class file
-					$fileDetails = array('path' => $plugin->folder_path . '/' . $plugin->file_name . '.php', 'name' => $plugin->file_name . '.php', 'zip' => $plugin->file_name . '.php');
+					$fileDetails = array('path' => $plugin->folder_path . '/' . $plugin->file_name . '.php',
-					$this->writeFile($fileDetails['path'], '<?php' . PHP_EOL . '// Plugin main class template' . PHP_EOL . $this->hhh . 'BOM' . $this->hhh . PHP_EOL . $this->hhh . 'MAINCLASS' . $this->hhh);
+						'name' => $plugin->file_name . '.php', 'zip' => $plugin->file_name . '.php');
+					$this->writeFile($fileDetails['path'],
+						'<?php' . PHP_EOL . '// Plugin main class template' .
+						PHP_EOL . $this->hhh . 'BOM' . $this->hhh . PHP_EOL .
+						PHP_EOL . '// No direct access to this file' . PHP_EOL .
+						"defined('_JEXEC') or die('Restricted access');" . PHP_EOL .
+						$this->hhh . 'MAINCLASS' . $this->hhh);
 					$this->newFiles[$plugin->key][] = $fileDetails;
 					// count the file created
 					$this->fileCount++;
 					// set main xml file
-					$fileDetails = array('path' => $plugin->folder_path . '/' . $plugin->file_name . '.xml', 'name' => $plugin->file_name . '.xml', 'zip' => $plugin->file_name . '.xml');
+					$fileDetails = array('path' => $plugin->folder_path . '/' . $plugin->file_name . '.xml',
+						'name' => $plugin->file_name . '.xml', 'zip' => $plugin->file_name . '.xml');
 					$this->writeFile($fileDetails['path'], $this->getPluginXMLTemplate($plugin));
 					$this->newFiles[$plugin->key][] = $fileDetails;
 					// count the file created
@@ -461,8 +469,14 @@ class Structure extends Get
 					// set install script if needed
 					if ($plugin->add_install_script)
 					{
-						$fileDetails = array('path' => $plugin->folder_path . '/script.php', 'name' => 'script.php', 'zip' => 'script.php');
+						$fileDetails = array('path' => $plugin->folder_path . '/script.php',
-						$this->writeFile($fileDetails['path'], '<?php' . PHP_EOL . '// Script template' . PHP_EOL . $this->hhh . 'BOM' . $this->hhh . PHP_EOL . $this->hhh . 'INSTALLCLASS' . $this->hhh);
+							'name' => 'script.php', 'zip' => 'script.php');
+						$this->writeFile($fileDetails['path'],
+							'<?php' . PHP_EOL . '// Script template' .
+							PHP_EOL . $this->hhh . 'BOM' . $this->hhh . PHP_EOL .
+							PHP_EOL . '// No direct access to this file' . PHP_EOL .
+							"defined('_JEXEC') or die('Restricted access');" . PHP_EOL .
+							$this->hhh . 'INSTALLCLASS' . $this->hhh);
 						$this->newFiles[$plugin->key][] = $fileDetails;
 						// count the file created
 						$this->fileCount++;
@@ -470,7 +484,8 @@ class Structure extends Get
 					// set readme if found
 					if ($plugin->addreadme)
 					{
-						$fileDetails = array('path' => $plugin->folder_path . '/README.md', 'name' => 'README.md', 'zip' => 'README.md');
+						$fileDetails = array('path' => $plugin->folder_path . '/README.md',
+							'name' => 'README.md', 'zip' => 'README.md');
 						$this->writeFile($fileDetails['path'], $plugin->readme);
 						$this->newFiles[$plugin->key][] = $fileDetails;
 						// count the file created
@@ -555,7 +570,8 @@ class Structure extends Get
 						foreach ($plugin->urls as $n => &$url)
 						{
 							// should we add the local folder
-							if (isset($url['type']) && $url['type'] > 1 && isset($url['url']) && ComponentbuilderHelper::checkString($url['url']))
+							if (isset($url['type']) && $url['type'] > 1 && isset($url['url'])
+								&& ComponentbuilderHelper::checkString($url['url']))
 							{
 								// set file name
 								$fileName = basename($url['url']);
@@ -1016,7 +1032,7 @@ class Structure extends Get
 				{
 					continue;
 				}
-				// check if we have a target value set
+				// check if we have a target value
 				if (isset($details->_target))
 				{
 					// set destination path
@@ -1094,14 +1110,15 @@ class Structure extends Get
 						$this->folderCount++;
 					}
 				}
-				// only add if no target found
+				// only add if no target found since those belong to plugins and modules
 				if (!isset($details->_target))
 				{
 					// check if we should add the dynamic folder moving script to the installer script
 					$checker = array_values((array) explode('/', $zipFullPath));
 					// TODO <-- this may not be the best way, will keep an eye on this.
 					// We basicly only want to check if a folder is added that is not in the stdFolders array
-					if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $this->stdFolders))
+					if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0])
+						&& !in_array($checker[0], $this->stdFolders))
 					{
 						// check if we should add the dynamic folder moving script to the installer script
 						if (!$this->setMoveFolders)
@@ -1113,16 +1130,32 @@ class Structure extends Get
 							$this->app->enqueueMessage(JText::sprintf('A method (setDynamicF0ld3rs) was added to the install <b>script.php</b> of this package to insure that the folder/s are copied into the correct place when this componet is installed!'), 'Notice');
 						}
 					}
-					elseif (count($checker) == 2 && ComponentbuilderHelper::checkString($checker[0]) && in_array($checker[0], $this->stdFolders))
+					elseif (count($checker) == 2 && ComponentbuilderHelper::checkString($checker[0]))
 					{
+						$add_to_extra = false;
 						// set the target
 						$eNAME = 'FILES';
 						$ename = 'filename';
+						// this should not happen and must have been caught by the above if statment
 						if ($details->type === 'folder')
+						{
+							// only folders outside the standard folder are added
+							if (!in_array($checker[0], $this->stdFolders))
 							{
 								$eNAME = 'FOLDERS';
 								$ename = 'folder';
+								$add_to_extra = true;
 							}
+						}
+						// if this is a file, it can only be added to the admin/site/media folders 
+						// all other folders are moved as a whole so their files do not need to be declared
+						elseif (in_array($checker[0], $this->stdFolders) && !in_array($checker[1], $this->stdRootFiles))
+						{
+							$add_to_extra = true;
+						}
+						// add if valid folder/file
+						if ($add_to_extra)
+						{
 							// set the tab
 							$eTab = $this->_t(2);
 							if ('admin' === $checker[0])
@@ -1134,6 +1167,7 @@ class Structure extends Get
 						}
 					}
 				}
+			}
 			return true;
 		}
 		return false;

admin/helpers/compiler/e_Interpretation.php

@@ -5218,7 +5218,7 @@ class Interpretation extends Fields
 			$script[] = $this->_t(2) . "\$folders = JFolder::folders(\$installPath);";
 			$script[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if we have folders we may want to copy";
 			$script[] = $this->_t(2) . "\$doNotCopy = array('media','admin','site'); // Joomla already deals with these";
-			$script[] = $this->_t(2) . "if (count(\$folders) > 1)";
+			$script[] = $this->_t(2) . "if (count((array) \$folders) > 1)";
 			$script[] = $this->_t(2) . "{";
 			$script[] = $this->_t(3) . "foreach (\$folders as \$folder)";
 			$script[] = $this->_t(3) . "{";
@@ -10807,7 +10807,7 @@ class Interpretation extends Fields
 					$function[] = $this->_t(2) . "\$query->from(\$db->quoteName('" . $filter['custom']['table'] . "', 'a'));";
 					$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " get the targeted groups";
 					$function[] = $this->_t(2) . "\$groups= JComponentHelper::getParams('com_" . $component . "')->get('" . $filter['type'] . "');";
-					$function[] = $this->_t(2) . "if (count(\$groups) > 0)";
+					$function[] = $this->_t(2) . "if (!empty(\$groups) && count((array) \$groups) > 0)";
 					$function[] = $this->_t(2) . "{";
 					$function[] = $this->_t(3) . "\$query->join('LEFT', \$db->quoteName('#__user_usergroup_map', 'group') . ' ON (' . \$db->quoteName('group.user_id') . ' = ' . \$db->quoteName('a.id') . ')');";
 					$function[] = $this->_t(3) . "\$query->where('group.group_id IN (' . implode(',', \$groups) . ')');";
@@ -16321,6 +16321,8 @@ function vdm_dkim() {
 		$xml = '';
 		// build the config fields
 		$config_field = '';
+		if (isset($plugin->config_fields) && ComponentbuilderHelper::checkArray($plugin->config_fields))
+		{
 			foreach ($plugin->config_fields as $field)
 			{
 				// check the field builder type
@@ -16345,6 +16347,7 @@ function vdm_dkim() {
 					$config_field .= $xmlField;
 				}
 			}
+		}
 		// switch to add the xml
 		$addLang = false;
 		// now build the language files
@@ -16474,27 +16477,167 @@ function vdm_dkim() {
 	{
 		// yes we are adding it
 		$script = PHP_EOL . '/**';
-		$script .= PHP_EOL . ' * ' . $plugin->name . ' script file.';
+		$script .= PHP_EOL . ' * ' . $plugin->official_name . ' script file.';
 		$script .= PHP_EOL . ' *';
 		$script .= PHP_EOL . ' * @package ' . $plugin->class_name;
 		$script .= PHP_EOL . ' */';
 		$script .= PHP_EOL . 'class ' . $plugin->installer_class_name;
 		$script .= PHP_EOL . '{';
+		// set constructor
+		if (isset($plugin->add_php_script_construct)
+			&& $plugin->add_php_script_construct == 1
+			&& ComponentbuilderHelper::checkString($plugin->php_script_construct))
+		{
+			$script .= $this->setInstallMethodScript('construct', $plugin->php_script_construct);
+		}
 		// add PHP in plugin install
 		$addScriptMethods = array('php_preflight', 'php_postflight', 'php_method');
-		$addScriptTypes = array('install', 'update', 'uninstall');
+		$addScriptTypes = array('install', 'update', 'uninstall', 'discover_install');
+		// set some buckets for sorting
+		$function_install = array();
+		$function_update = array();
+		$function_uninstall = array();
+		$has_php_preflight = false;
+		$function_php_preflight = array('install' => array(), 'uninstall' => array(), 'discover_install' => array(), 'update' => array());
+		$has_php_postflight = false;
+		$function_php_postflight = array('install' => array(), 'uninstall' => array(), 'discover_install' => array(), 'update' => array());
+		// the function sorter
 		foreach ($addScriptMethods as $scriptMethod)
 		{
 			foreach ($addScriptTypes as $scriptType)
 			{
-				if (isset($plugin->{'add_' . $scriptMethod . '_' . $scriptType}) && $plugin->{'add_' . $scriptMethod . '_' . $scriptType} == 1 && ComponentbuilderHelper::checkString($plugin->{$scriptMethod . '_' . $scriptType}))
+				if (isset($plugin->{'add_' . $scriptMethod . '_' . $scriptType})
+					&& $plugin->{'add_' . $scriptMethod . '_' . $scriptType} == 1
+					&& ComponentbuilderHelper::checkString($plugin->{$scriptMethod . '_' . $scriptType}))
 				{
-					// (TODO) must still finish
+					// add to the main methods
-					$script .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' This part of the new plugin area is not ready yet, soon!';
+					if ('php_method' === $scriptMethod)
+					{
+						${'function_' . $scriptType}[] = $plugin->{$scriptMethod . '_' . $scriptType};
+					}
+					else
+					{
+						${'function_' . $scriptMethod}[$scriptType][] = $plugin->{$scriptMethod . '_' . $scriptType};
+						${'has_' . $scriptMethod} = true;
 					}
 				}
 			}
+		}
+		// now add the install script.
+		if (ComponentbuilderHelper::checkArray($function_install))
+		{
+			$script .= $this->setInstallMethodScript('install', $function_install);
+		}
+		// now add the update script.
+		if (ComponentbuilderHelper::checkArray($function_update))
+		{
+			$script .= $this->setInstallMethodScript('update', $function_update);
+		}
+		// now add the uninstall script.
+		if (ComponentbuilderHelper::checkArray($function_uninstall))
+		{
+			$script .= $this->setInstallMethodScript('uninstall', $function_uninstall);
+		}
+		// now add the preflight script.
+		if ($has_php_preflight)
+		{
+			$script .= $this->setInstallMethodScript('preflight', $function_php_preflight);
+		}
+		// now add the postflight script.
+		if ($has_php_postflight)
+		{
+			$script .= $this->setInstallMethodScript('postflight', $function_php_postflight);
+		}
 		$script .= PHP_EOL . '}' . PHP_EOL;
+
+		return $script;
+	}
+
+	protected function setInstallMethodScript($function_name, &$scripts)
+	{
+		$script = '';
+		// build function
+		switch($function_name)
+		{
+			case 'install':
+			case 'update':
+			case 'uninstall':
+				// the main function types
+				$script = PHP_EOL . PHP_EOL . $this->_t(1) .'/**';
+				$script .= PHP_EOL . $this->_t(1) .' * Called on ' . $function_name;
+				$script .= PHP_EOL . $this->_t(1) .' *';
+				$script .= PHP_EOL . $this->_t(1) .' * @param   JAdapterInstance  $adapter  The object responsible for running this script';
+				$script .= PHP_EOL . $this->_t(1) .' *';
+				$script .= PHP_EOL . $this->_t(1) .' * @return  boolean  True on success';
+				$script .= PHP_EOL . $this->_t(1) .' */';
+				$script .= PHP_EOL . $this->_t(1) .'public function ' . $function_name . '(JAdapterInstance $adapter)';
+				$script .= PHP_EOL . $this->_t(1) .'{';
+				$script .= PHP_EOL . implode(PHP_EOL . PHP_EOL, $scripts);
+				// return true
+				if ('uninstall' !== $function_name)
+				{
+					$script .= PHP_EOL . $this->_t(2) . 'return true;';
+				}
+				break;
+			case 'preflight':
+			case 'postflight':
+				// the pre/post function types
+				$script = PHP_EOL . PHP_EOL . $this->_t(1) .'/**';
+				$script .= PHP_EOL . $this->_t(1) .' * Called before any type of action';
+				$script .= PHP_EOL . $this->_t(1) .' *';
+				$script .= PHP_EOL . $this->_t(1) .' * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)';
+				$script .= PHP_EOL . $this->_t(1) .' * @param   JAdapterInstance  $adapter  The object responsible for running this script';
+				$script .= PHP_EOL . $this->_t(1) .' *';
+				$script .= PHP_EOL . $this->_t(1) .' * @return  boolean  True on success';
+				$script .= PHP_EOL . $this->_t(1) .' */';
+				$script .= PHP_EOL . $this->_t(1) .'public function ' . $function_name . '($route, JAdapterInstance $adapter)';
+				$script .= PHP_EOL . $this->_t(1) .'{';
+				$script .= PHP_EOL . $this->_t(2) . '//' . $this->setLine(__LINE__) . ' get application';
+				$script .= PHP_EOL . $this->_t(2) . '$app = JFactory::getApplication();' . PHP_EOL;
+				// add the default version check (TODO) must make this dynamic
+				if ('preflight' === $function_name)
+				{
+					$script .= PHP_EOL . $this->_t(2) . '//' . $this->setLine(__LINE__) . ' the default for both install and update';
+					$script .= PHP_EOL . $this->_t(2) . '$jversion = new JVersion();';
+					$script .= PHP_EOL . $this->_t(2) . "if (!\$jversion->isCompatible('3.8.0'))";
+					$script .= PHP_EOL . $this->_t(2) . '{';
+					$script .= PHP_EOL . $this->_t(3) . "\$app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');";
+					$script .= PHP_EOL . $this->_t(3) . 'return false;';
+					$script .= PHP_EOL . $this->_t(2) . '}' . PHP_EOL;
+				}
+				// now add the scripts
+				foreach ($scripts as $route => $_script)
+				{
+					if (ComponentbuilderHelper::checkArray($_script))
+					{
+						// set the if and script
+						$script .= PHP_EOL . $this->_t(2) . "if ('" . $route . "' === \$route)";
+						$script .= PHP_EOL . $this->_t(2) . '{';
+						$script .= PHP_EOL . implode(PHP_EOL . PHP_EOL, $_script);
+						$script .= PHP_EOL . $this->_t(2) . '}' . PHP_EOL;
+					}
+				}
+				// return true
+				$script .= PHP_EOL . $this->_t(2) . 'return true;';
+				break;
+			case 'construct':
+				// the __construct script
+				$script = PHP_EOL . PHP_EOL . $this->_t(1) .'/**';
+				$script .= PHP_EOL . $this->_t(1) .' * Constructor';
+				$script .= PHP_EOL . $this->_t(1) .' *';
+				$script .= PHP_EOL . $this->_t(1) .' * @param   JAdapterInstance  $adapter  The object responsible for running this script';
+				$script .= PHP_EOL . $this->_t(1) .' */';
+				$script .= PHP_EOL . $this->_t(1) .'public function __construct(JAdapterInstance $adapter)';
+				$script .= PHP_EOL . $this->_t(1) .'{';
+				$script .= PHP_EOL . $scripts;
+				break;
+			default:
+				// oops error
+				return '';
+		}
+		// close the function
+		$script .= PHP_EOL . $this->_t(1) . '}';
+
 		return $script;
 	}
 

admin/helpers/compiler/f_Infusion.php

@@ -1032,9 +1032,6 @@ class Infusion extends Interpretation
 				$this->fileContentStatic[$this->hhh . 'README' . $this->hhh] = $this->componentData->readme;
 			}
 
-			// Trigger Event: jcb_ce_onAfterBuildFilesContent
-			$this->triggerEvent('jcb_ce_onAfterBuildFilesContent', array(&$this->componentContext, &$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));// Trigger Event: jcb_ce_onBeforeSetPlugins
-
 			// infuze plugin data if set
 			if (ComponentbuilderHelper::checkArray($this->componentData->joomla_plugins))
 			{
@@ -1056,6 +1053,9 @@ class Infusion extends Interpretation
 				}
 			}
 
+			// Trigger Event: jcb_ce_onAfterBuildFilesContent
+			$this->triggerEvent('jcb_ce_onAfterBuildFilesContent', array(&$this->componentContext, &$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+
 			return true;
 		}
 		return false;

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

@@ -5944,6 +5944,46 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGINS_N_ITEMS_UNPUBLISHED="%s Joomla Plugins unpub
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_N_ITEMS_UNPUBLISHED_1="%s Joomla Plugin unpublished."
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU="Joomla Plugins Submenu"
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU_DESC="Allows the users in this group to submenu of joomla plugin"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES="Joomla Plugins Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS="Joomla Plugins Updates Access"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS_DESC="Allows the users in this group to access access joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_OPTIONS="Batch process the selected Joomla Plugins Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_TIP="All changes will be applied to all selected Joomla Plugins Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE="Joomla Plugins Updates Batch Use"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE="Joomla Plugins Updates Create"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE_DESC="Allows the users in this group to create create joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE="Joomla Plugins Updates Delete"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE_DESC="Allows the users in this group to delete delete joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT="Joomla Plugins Updates Edit"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY="Joomla Plugins Updates Edit Created By"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE="Joomla Plugins Updates Edit Created Date"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_DESC="Allows the users in this group to edit the joomla plugin updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN="Joomla Plugins Updates Edit Own"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN_DESC="Allows the users in this group to edit edit own joomla plugins updates created by them"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE="Joomla Plugins Updates Edit State"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla plugin updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION="Joomla Plugins Updates Edit Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_ARCHIVED="%s Joomla Plugins Updates archived."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_ARCHIVED_1="%s Joomla Plugin Updates archived."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_CHECKED_IN_0="No Joomla Plugin Updates successfully checked in."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_CHECKED_IN_1="%d Joomla Plugin Updates successfully checked in."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_CHECKED_IN_MORE="%d Joomla Plugins Updates successfully checked in."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_DELETED="%s Joomla Plugins Updates deleted."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_DELETED_1="%s Joomla Plugin Updates deleted."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_FEATURED="%s Joomla Plugins Updates featured."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_FEATURED_1="%s Joomla Plugin Updates featured."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_PUBLISHED="%s Joomla Plugins Updates published."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_PUBLISHED_1="%s Joomla Plugin Updates published."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_TRASHED="%s Joomla Plugins Updates trashed."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_TRASHED_1="%s Joomla Plugin Updates trashed."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNFEATURED="%s Joomla Plugins Updates unfeatured."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNFEATURED_1="%s Joomla Plugin Updates unfeatured."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNPUBLISHED="%s Joomla Plugins Updates unpublished."
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNPUBLISHED_1="%s Joomla Plugin Updates unpublished."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME="Addreadme"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL="Add README"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_HEAD="Add Head"
@@ -5961,6 +6001,8 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_PREFLIGHT_UNINSTALL="Add Php Prefligh
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_PREFLIGHT_UNINSTALL_LABEL="Add PHP Preflight (uninstall)"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_PREFLIGHT_UPDATE="Add Php Preflight Update"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_PREFLIGHT_UPDATE_LABEL="Add PHP Preflight (update)"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_SCRIPT_CONSTRUCT="Add Php Script Construct"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_SCRIPT_CONSTRUCT_LABEL="Add PHP Script Construct"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER="Add Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL="Add Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL="Add Sql"
@@ -5980,6 +6022,10 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_DESCRIPTION="Enter custom value if needed"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_HINT="Custom Value Here"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CUSTOM_VALUE_LABEL="Custom Value"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION="Description"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_DESCRIPTION="Add Description Here"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_HINT="Add Description Here"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_LABEL="Description"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DYNAMIC_INTEGRATION="Dynamic Integration"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_EDIT="Editing the Joomla Plugin"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ERROR_UNIQUE_ALIAS="Another Joomla Plugin has the same alias."
@@ -6188,8 +6234,6 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NEW="A New Joomla Plugin"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO="No"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_BETA_STAGE_DESCRIPTION="This area is still in beta, and is not ready for use. Things may work, but they are not wired up to the back-end/compiler. You are already seeing it since JCB is being developed in a reverse motion of front-end/GUI to back-end/Compiler approach. We first build the GUI... and then the Back-end, which is not normally how it is done, or so I was told.... But anyway that is how JCB is being build, we get the idea, look at all the relationships and build the tables, and columns, which then map to views and fields (GUI), we then build the functions in the compiler to act upon these new data-sets, and whammm the full functionality/idea becomes stable and ready. So in due time this area will become available for your use, and then this message will go away! (or the whole area will just disappear if it does not work out :)"
-COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_BETA_STAGE_LABEL="Beta Stage"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_PLUGIN_DESCRIPTION="<p>So over here you are able to manually code your plugin methods which usually will be the event name you are targeting.</p><p>We have also added some methods via the <a href='https://github.com/vdm-io/boilerplate' title='look at the boilerplate repo' target='_blank'>boilerplate repo</a> that can serve as a starting point, simple select them and it will be added to your code.</p><p><p>If you have added any fields in the Config/Params tab, these fields will be available to you in the <code>$this->params</code> object, and can be accessed via the field name <code>$this->params->get('fieldname');</code> with the get method.</p>"
@@ -6222,6 +6266,14 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UNINSTALL_LABEL="PHP Preflight
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE="Php Preflight Update"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_DESCRIPTION="PHP script that should run preflight during update."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_LABEL="PHP Preflight (update)"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT="Php Script Construct"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_DESCRIPTION="PHP script that should run in  __construct of script."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_LABEL="PHP Script Construct"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION="Plugin Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_DESCRIPTION="Add Version Number Here"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_HINT="1.0.0"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_LABEL="Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_MESSAGE="Error! Please add version here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS="Joomla Plugin Properties Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the properties button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTY="Property"
@@ -6254,6 +6306,42 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_DESCRIPTION="Used only in the sys
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_HINT="The System Name Here"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_LABEL="System Name"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_MESSAGE="Error! Please add some text here."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES="Joomla Plugin Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_BY_DESC="The user that created this Joomla Plugin Updates."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_DATE_DESC="The date this Joomla Plugin Updates was created."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_EDIT="Editing the Joomla Plugin Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ERROR_UNIQUE_ALIAS="Another Joomla Plugin Updates has the same alias."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ID="Id"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_JOOMLA_PLUGIN="Joomla Plugin"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_JOOMLA_PLUGIN_LABEL="Joomla Plugins"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_BY_DESC="The last user that modified this Joomla Plugin Updates."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_DATE_DESC="The date this Joomla Plugin Updates was modified."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_DATE_LABEL="Modified Date"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_DESCRIPTION="Update Dump"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_HINT="// MySQL for update or blank for none"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_LABEL="MySQL"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_NEW="A New Joomla Plugin Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ORDERING_LABEL="Ordering"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Joomla Plugin Updates to customise the alias."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_STATUS="Status"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_UPDATES="Updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_DESCRIPTION="Enter Download Link"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_HINT="http://www.example.com/file.zip"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_LABEL="Version URL"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_MESSAGE="Error! Please add url here."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESC="A count of the number of times this Joomla Plugin Updates has been revised."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESCRIPTION="1.0.0"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_HINT="1.0.0"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_MESSAGE="Error! Please add some text here."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE="Version Update"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE_LABEL="Version Updates"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION="Select your update server for this component."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL="Update Server"
@@ -8190,6 +8278,7 @@ COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
 COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: <code>%s</code>"
 COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_S="The package key is: %s"
 COM_COMPONENTBUILDER_THE_PLUGIN_FILES_FOLDERS="The plugin files & folders"
+COM_COMPONENTBUILDER_THE_PLUGIN_UPDATES="The plugin updates"
 COM_COMPONENTBUILDER_THE_PRIVATE_KEY_FIELD_COULD_NOT_BE_LOADED_FOR_BSB_SERVER="The private key field could not be loaded for <b>%s</b> server!"
 COM_COMPONENTBUILDER_THE_PRIVATE_KEY_FILE_COULD_NOT_BE_LOADEDFOUND_FOR_BSB_SERVER="The private key file could not be loaded/found for <b>%s</b> server!"
 COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading"

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

@@ -682,6 +682,26 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_VERSION="Joomla Plug
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla plugins files folders  urls"
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU="Joomla Plugins Submenu"
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_SUBMENU_DESC="Allows the users in this group to submenu of joomla plugin"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS="Joomla Plugins Updates Access"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_ACCESS_DESC="Allows the users in this group to access access joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE="Joomla Plugins Updates Batch Use"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE="Joomla Plugins Updates Create"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_CREATE_DESC="Allows the users in this group to create create joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE="Joomla Plugins Updates Delete"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_DELETE_DESC="Allows the users in this group to delete delete joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT="Joomla Plugins Updates Edit"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY="Joomla Plugins Updates Edit Created By"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE="Joomla Plugins Updates Edit Created Date"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created joomla plugins updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_DESC="Allows the users in this group to edit the joomla plugin updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN="Joomla Plugins Updates Edit Own"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN_DESC="Allows the users in this group to edit edit own joomla plugins updates created by them"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE="Joomla Plugins Updates Edit State"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla plugin updates"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION="Joomla Plugins Updates Edit Version"
+COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla plugins updates"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GET_BOILERPLATE_BUTTON_ACCESS="Joomla Plugin Get Boilerplate Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GET_BOILERPLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the get boilerplate button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_ACCESS="Joomla Plugin Groups Access"

admin/layouts/joomla_plugin/code_above.php

@@ -26,7 +26,8 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
-	'system_name'
+	'system_name',
+	'plugin_version'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/joomla_plugin/code_left.php

@@ -26,8 +26,8 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
-	'note_beta_stage',
 	'name',
+	'description',
 	'class_extends',
 	'joomla_plugin_group',
 	'add_head',

admin/layouts/joomla_plugin/script_file_fullwidth.php

@@ -26,6 +26,8 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'add_php_script_construct',
+	'php_script_construct',
 	'add_php_preflight_install',
 	'php_preflight_install',
 	'add_php_preflight_update',

admin/layouts/joomla_plugin_updates/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/layouts/joomla_plugin_updates/publishing.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'created',
+	'created_by',
+	'modified',
+	'modified_by'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/joomla_plugin_updates/publlshing.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'published',
+	'ordering',
+	'access',
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/joomla_plugin_updates/updates_above.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'joomla_plugin'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="form-inline form-inline-header">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/layouts/joomla_plugin_updates/updates_fullwidth.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'version_update'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="form-vertical">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/models/componentbuilder.php

@@ -194,6 +194,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 			'class_extends.access' => 'class_extends.access',
 			'joomla_plugin_groups.access' => 'joomla_plugin_group.access',
 			'joomla_plugin_group.access' => 'joomla_plugin_group.access',
+			'joomla_plugin_updates.create' => 'joomla_plugin_updates.create',
+			'joomla_plugins_updates.access' => 'joomla_plugin_updates.access',
+			'joomla_plugin_updates.access' => 'joomla_plugin_updates.access',
 			'joomla_plugin_files_folders_urls.create' => 'joomla_plugin_files_folders_urls.create',
 			'joomla_plugins_files_folders_urls.access' => 'joomla_plugin_files_folders_urls.access',
 			'joomla_plugin_files_folders_urls.access' => 'joomla_plugin_files_folders_urls.access');

admin/models/forms/admin_view.js

@@ -9,123 +9,123 @@
  */
 
 // Some Global Values
-jform_vvvvvyyvwh_required = false;
+jform_vvvvvyzvwh_required = false;
-jform_vvvvvyzvwi_required = false;
+jform_vvvvvzavwi_required = false;
-jform_vvvvvzdvwj_required = false;
+jform_vvvvvzevwj_required = false;
-jform_vvvvvzdvwk_required = false;
+jform_vvvvvzevwk_required = false;
-jform_vvvvvzdvwl_required = false;
+jform_vvvvvzevwl_required = false;
-jform_vvvvvzdvwm_required = false;
+jform_vvvvvzevwm_required = false;
-jform_vvvvvzdvwn_required = false;
+jform_vvvvvzevwn_required = false;
-jform_vvvvvzdvwo_required = false;
+jform_vvvvvzevwo_required = false;
-jform_vvvvvzdvwp_required = false;
+jform_vvvvvzevwp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_css_view_vvvvvxy = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvvxz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvxy(add_css_view_vvvvvxy);
+	vvvvvxz(add_css_view_vvvvvxz);
 
-	var add_css_views_vvvvvxz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvvya = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvxz(add_css_views_vvvvvxz);
+	vvvvvya(add_css_views_vvvvvya);
 
-	var add_javascript_view_file_vvvvvya = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	var add_javascript_view_file_vvvvvyb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvya(add_javascript_view_file_vvvvvya);
+	vvvvvyb(add_javascript_view_file_vvvvvyb);
 
-	var add_javascript_views_file_vvvvvyb = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	var add_javascript_views_file_vvvvvyc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvyb(add_javascript_views_file_vvvvvyb);
+	vvvvvyc(add_javascript_views_file_vvvvvyc);
 
-	var add_javascript_view_footer_vvvvvyc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvvyd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvyc(add_javascript_view_footer_vvvvvyc);
+	vvvvvyd(add_javascript_view_footer_vvvvvyd);
 
-	var add_javascript_views_footer_vvvvvyd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvvye = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvyd(add_javascript_views_footer_vvvvvyd);
+	vvvvvye(add_javascript_views_footer_vvvvvye);
 
-	var add_php_ajax_vvvvvye = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvye(add_php_ajax_vvvvvye);
+	vvvvvyf(add_php_ajax_vvvvvyf);
 
-	var add_php_getitem_vvvvvyf = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	var add_php_getitem_vvvvvyg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvyf(add_php_getitem_vvvvvyf);
+	vvvvvyg(add_php_getitem_vvvvvyg);
 
-	var add_php_getitems_vvvvvyg = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	var add_php_getitems_vvvvvyh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvyg(add_php_getitems_vvvvvyg);
+	vvvvvyh(add_php_getitems_vvvvvyh);
 
-	var add_php_getitems_after_all_vvvvvyh = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	var add_php_getitems_after_all_vvvvvyi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvyh(add_php_getitems_after_all_vvvvvyh);
+	vvvvvyi(add_php_getitems_after_all_vvvvvyi);
 
-	var add_php_getlistquery_vvvvvyi = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvyj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvyi(add_php_getlistquery_vvvvvyi);
+	vvvvvyj(add_php_getlistquery_vvvvvyj);
 
-	var add_php_getform_vvvvvyj = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	var add_php_getform_vvvvvyk = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
-	vvvvvyj(add_php_getform_vvvvvyj);
+	vvvvvyk(add_php_getform_vvvvvyk);
 
-	var add_php_before_save_vvvvvyk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvyl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvyk(add_php_before_save_vvvvvyk);
+	vvvvvyl(add_php_before_save_vvvvvyl);
 
-	var add_php_save_vvvvvyl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvym = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvyl(add_php_save_vvvvvyl);
+	vvvvvym(add_php_save_vvvvvym);
 
-	var add_php_postsavehook_vvvvvym = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvyn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvym(add_php_postsavehook_vvvvvym);
+	vvvvvyn(add_php_postsavehook_vvvvvyn);
 
-	var add_php_allowadd_vvvvvyn = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	var add_php_allowadd_vvvvvyo = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
-	vvvvvyn(add_php_allowadd_vvvvvyn);
+	vvvvvyo(add_php_allowadd_vvvvvyo);
 
-	var add_php_allowedit_vvvvvyo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvyp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvyo(add_php_allowedit_vvvvvyo);
+	vvvvvyp(add_php_allowedit_vvvvvyp);
 
-	var add_php_before_cancel_vvvvvyp = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	var add_php_before_cancel_vvvvvyq = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
-	vvvvvyp(add_php_before_cancel_vvvvvyp);
+	vvvvvyq(add_php_before_cancel_vvvvvyq);
 
-	var add_php_after_cancel_vvvvvyq = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	var add_php_after_cancel_vvvvvyr = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
-	vvvvvyq(add_php_after_cancel_vvvvvyq);
+	vvvvvyr(add_php_after_cancel_vvvvvyr);
 
-	var add_php_batchcopy_vvvvvyr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvys = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvyr(add_php_batchcopy_vvvvvyr);
+	vvvvvys(add_php_batchcopy_vvvvvys);
 
-	var add_php_batchmove_vvvvvys = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvyt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvys(add_php_batchmove_vvvvvys);
+	vvvvvyt(add_php_batchmove_vvvvvyt);
 
-	var add_php_before_publish_vvvvvyt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvyu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvyt(add_php_before_publish_vvvvvyt);
+	vvvvvyu(add_php_before_publish_vvvvvyu);
 
-	var add_php_after_publish_vvvvvyu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvyv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvyu(add_php_after_publish_vvvvvyu);
+	vvvvvyv(add_php_after_publish_vvvvvyv);
 
-	var add_php_before_delete_vvvvvyv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvyw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvyv(add_php_before_delete_vvvvvyv);
+	vvvvvyw(add_php_before_delete_vvvvvyw);
 
-	var add_php_after_delete_vvvvvyw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvyx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvyw(add_php_after_delete_vvvvvyw);
+	vvvvvyx(add_php_after_delete_vvvvvyx);
 
-	var add_php_document_vvvvvyx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyx(add_php_document_vvvvvyx);
+	vvvvvyy(add_php_document_vvvvvyy);
 
-	var add_sql_vvvvvyy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyy(add_sql_vvvvvyy);
-
-	var source_vvvvvyz = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz);
+	vvvvvyz(add_sql_vvvvvyz);
 
-	var source_vvvvvzb = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvza = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvzb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvza = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb);
+	vvvvvza(source_vvvvvza,add_sql_vvvvvza);
 
-	var add_custom_import_vvvvvzd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvzc = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvzd(add_custom_import_vvvvvzd);
+	var add_sql_vvvvvzc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc);
 
 	var add_custom_import_vvvvvze = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	vvvvvze(add_custom_import_vvvvvze);
 
-	var add_custom_button_vvvvvzf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_import_vvvvvzf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvzf(add_custom_button_vvvvvzf);
+	vvvvvzf(add_custom_import_vvvvvzf);
+
+	var add_custom_button_vvvvvzg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzg(add_custom_button_vvvvvzg);
 });
 
-// the vvvvvxy function
+// the vvvvvxz function
-function vvvvvxy(add_css_view_vvvvvxy)
+function vvvvvxz(add_css_view_vvvvvxz)
 {
 	// set the function logic
-	if (add_css_view_vvvvvxy == 1)
+	if (add_css_view_vvvvvxz == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 	}
@@ -135,11 +135,11 @@ function vvvvvxy(add_css_view_vvvvvxy)
 	}
 }
 
-// the vvvvvxz function
+// the vvvvvya function
-function vvvvvxz(add_css_views_vvvvvxz)
+function vvvvvya(add_css_views_vvvvvya)
 {
 	// set the function logic
-	if (add_css_views_vvvvvxz == 1)
+	if (add_css_views_vvvvvya == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 	}
@@ -149,11 +149,11 @@ function vvvvvxz(add_css_views_vvvvvxz)
 	}
 }
 
-// the vvvvvya function
+// the vvvvvyb function
-function vvvvvya(add_javascript_view_file_vvvvvya)
+function vvvvvyb(add_javascript_view_file_vvvvvyb)
 {
 	// set the function logic
-	if (add_javascript_view_file_vvvvvya == 1)
+	if (add_javascript_view_file_vvvvvyb == 1)
 	{
 		jQuery('#jform_javascript_view_file-lbl').closest('.control-group').show();
 	}
@@ -163,11 +163,11 @@ function vvvvvya(add_javascript_view_file_vvvvvya)
 	}
 }
 
-// the vvvvvyb function
+// the vvvvvyc function
-function vvvvvyb(add_javascript_views_file_vvvvvyb)
+function vvvvvyc(add_javascript_views_file_vvvvvyc)
 {
 	// set the function logic
-	if (add_javascript_views_file_vvvvvyb == 1)
+	if (add_javascript_views_file_vvvvvyc == 1)
 	{
 		jQuery('#jform_javascript_views_file-lbl').closest('.control-group').show();
 	}
@@ -177,11 +177,11 @@ function vvvvvyb(add_javascript_views_file_vvvvvyb)
 	}
 }
 
-// the vvvvvyc function
+// the vvvvvyd function
-function vvvvvyc(add_javascript_view_footer_vvvvvyc)
+function vvvvvyd(add_javascript_view_footer_vvvvvyd)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvvyc == 1)
+	if (add_javascript_view_footer_vvvvvyd == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 	}
@@ -191,11 +191,11 @@ function vvvvvyc(add_javascript_view_footer_vvvvvyc)
 	}
 }
 
-// the vvvvvyd function
+// the vvvvvye function
-function vvvvvyd(add_javascript_views_footer_vvvvvyd)
+function vvvvvye(add_javascript_views_footer_vvvvvye)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvvyd == 1)
+	if (add_javascript_views_footer_vvvvvye == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 	}
@@ -205,11 +205,11 @@ function vvvvvyd(add_javascript_views_footer_vvvvvyd)
 	}
 }
 
-// the vvvvvye function
+// the vvvvvyf function
-function vvvvvye(add_php_ajax_vvvvvye)
+function vvvvvyf(add_php_ajax_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvye == 1)
+	if (add_php_ajax_vvvvvyf == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
@@ -221,11 +221,11 @@ function vvvvvye(add_php_ajax_vvvvvye)
 	}
 }
 
-// the vvvvvyf function
+// the vvvvvyg function
-function vvvvvyf(add_php_getitem_vvvvvyf)
+function vvvvvyg(add_php_getitem_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_getitem_vvvvvyf == 1)
+	if (add_php_getitem_vvvvvyg == 1)
 	{
 		jQuery('#jform_php_getitem-lbl').closest('.control-group').show();
 	}
@@ -235,11 +235,11 @@ function vvvvvyf(add_php_getitem_vvvvvyf)
 	}
 }
 
-// the vvvvvyg function
+// the vvvvvyh function
-function vvvvvyg(add_php_getitems_vvvvvyg)
+function vvvvvyh(add_php_getitems_vvvvvyh)
 {
 	// set the function logic
-	if (add_php_getitems_vvvvvyg == 1)
+	if (add_php_getitems_vvvvvyh == 1)
 	{
 		jQuery('#jform_php_getitems-lbl').closest('.control-group').show();
 	}
@@ -249,11 +249,11 @@ function vvvvvyg(add_php_getitems_vvvvvyg)
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyi function
-function vvvvvyh(add_php_getitems_after_all_vvvvvyh)
+function vvvvvyi(add_php_getitems_after_all_vvvvvyi)
 {
 	// set the function logic
-	if (add_php_getitems_after_all_vvvvvyh == 1)
+	if (add_php_getitems_after_all_vvvvvyi == 1)
 	{
 		jQuery('#jform_php_getitems_after_all-lbl').closest('.control-group').show();
 	}
@@ -263,11 +263,11 @@ function vvvvvyh(add_php_getitems_after_all_vvvvvyh)
 	}
 }
 
-// the vvvvvyi function
+// the vvvvvyj function
-function vvvvvyi(add_php_getlistquery_vvvvvyi)
+function vvvvvyj(add_php_getlistquery_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_getlistquery_vvvvvyi == 1)
+	if (add_php_getlistquery_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
 	}
@@ -277,11 +277,11 @@ function vvvvvyi(add_php_getlistquery_vvvvvyi)
 	}
 }
 
-// the vvvvvyj function
+// the vvvvvyk function
-function vvvvvyj(add_php_getform_vvvvvyj)
+function vvvvvyk(add_php_getform_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_getform_vvvvvyj == 1)
+	if (add_php_getform_vvvvvyk == 1)
 	{
 		jQuery('#jform_php_getform-lbl').closest('.control-group').show();
 	}
@@ -291,11 +291,11 @@ function vvvvvyj(add_php_getform_vvvvvyj)
 	}
 }
 
-// the vvvvvyk function
+// the vvvvvyl function
-function vvvvvyk(add_php_before_save_vvvvvyk)
+function vvvvvyl(add_php_before_save_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_before_save_vvvvvyk == 1)
+	if (add_php_before_save_vvvvvyl == 1)
 	{
 		jQuery('#jform_php_before_save-lbl').closest('.control-group').show();
 	}
@@ -305,11 +305,11 @@ function vvvvvyk(add_php_before_save_vvvvvyk)
 	}
 }
 
-// the vvvvvyl function
+// the vvvvvym function
-function vvvvvyl(add_php_save_vvvvvyl)
+function vvvvvym(add_php_save_vvvvvym)
 {
 	// set the function logic
-	if (add_php_save_vvvvvyl == 1)
+	if (add_php_save_vvvvvym == 1)
 	{
 		jQuery('#jform_php_save-lbl').closest('.control-group').show();
 	}
@@ -319,11 +319,11 @@ function vvvvvyl(add_php_save_vvvvvyl)
 	}
 }
 
-// the vvvvvym function
+// the vvvvvyn function
-function vvvvvym(add_php_postsavehook_vvvvvym)
+function vvvvvyn(add_php_postsavehook_vvvvvyn)
 {
 	// set the function logic
-	if (add_php_postsavehook_vvvvvym == 1)
+	if (add_php_postsavehook_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_postsavehook-lbl').closest('.control-group').show();
 	}
@@ -333,11 +333,11 @@ function vvvvvym(add_php_postsavehook_vvvvvym)
 	}
 }
 
-// the vvvvvyn function
+// the vvvvvyo function
-function vvvvvyn(add_php_allowadd_vvvvvyn)
+function vvvvvyo(add_php_allowadd_vvvvvyo)
 {
 	// set the function logic
-	if (add_php_allowadd_vvvvvyn == 1)
+	if (add_php_allowadd_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_allowadd-lbl').closest('.control-group').show();
 	}
@@ -347,11 +347,11 @@ function vvvvvyn(add_php_allowadd_vvvvvyn)
 	}
 }
 
-// the vvvvvyo function
+// the vvvvvyp function
-function vvvvvyo(add_php_allowedit_vvvvvyo)
+function vvvvvyp(add_php_allowedit_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_allowedit_vvvvvyo == 1)
+	if (add_php_allowedit_vvvvvyp == 1)
 	{
 		jQuery('#jform_php_allowedit-lbl').closest('.control-group').show();
 	}
@@ -361,11 +361,11 @@ function vvvvvyo(add_php_allowedit_vvvvvyo)
 	}
 }
 
-// the vvvvvyp function
+// the vvvvvyq function
-function vvvvvyp(add_php_before_cancel_vvvvvyp)
+function vvvvvyq(add_php_before_cancel_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_before_cancel_vvvvvyp == 1)
+	if (add_php_before_cancel_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_before_cancel-lbl').closest('.control-group').show();
 	}
@@ -375,11 +375,11 @@ function vvvvvyp(add_php_before_cancel_vvvvvyp)
 	}
 }
 
-// the vvvvvyq function
+// the vvvvvyr function
-function vvvvvyq(add_php_after_cancel_vvvvvyq)
+function vvvvvyr(add_php_after_cancel_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_after_cancel_vvvvvyq == 1)
+	if (add_php_after_cancel_vvvvvyr == 1)
 	{
 		jQuery('#jform_php_after_cancel-lbl').closest('.control-group').show();
 	}
@@ -389,11 +389,11 @@ function vvvvvyq(add_php_after_cancel_vvvvvyq)
 	}
 }
 
-// the vvvvvyr function
+// the vvvvvys function
-function vvvvvyr(add_php_batchcopy_vvvvvyr)
+function vvvvvys(add_php_batchcopy_vvvvvys)
 {
 	// set the function logic
-	if (add_php_batchcopy_vvvvvyr == 1)
+	if (add_php_batchcopy_vvvvvys == 1)
 	{
 		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
 	}
@@ -403,11 +403,11 @@ function vvvvvyr(add_php_batchcopy_vvvvvyr)
 	}
 }
 
-// the vvvvvys function
+// the vvvvvyt function
-function vvvvvys(add_php_batchmove_vvvvvys)
+function vvvvvyt(add_php_batchmove_vvvvvyt)
 {
 	// set the function logic
-	if (add_php_batchmove_vvvvvys == 1)
+	if (add_php_batchmove_vvvvvyt == 1)
 	{
 		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
 	}
@@ -417,11 +417,11 @@ function vvvvvys(add_php_batchmove_vvvvvys)
 	}
 }
 
-// the vvvvvyt function
+// the vvvvvyu function
-function vvvvvyt(add_php_before_publish_vvvvvyt)
+function vvvvvyu(add_php_before_publish_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_before_publish_vvvvvyt == 1)
+	if (add_php_before_publish_vvvvvyu == 1)
 	{
 		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
 	}
@@ -431,11 +431,11 @@ function vvvvvyt(add_php_before_publish_vvvvvyt)
 	}
 }
 
-// the vvvvvyu function
+// the vvvvvyv function
-function vvvvvyu(add_php_after_publish_vvvvvyu)
+function vvvvvyv(add_php_after_publish_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_after_publish_vvvvvyu == 1)
+	if (add_php_after_publish_vvvvvyv == 1)
 	{
 		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
 	}
@@ -445,11 +445,11 @@ function vvvvvyu(add_php_after_publish_vvvvvyu)
 	}
 }
 
-// the vvvvvyv function
+// the vvvvvyw function
-function vvvvvyv(add_php_before_delete_vvvvvyv)
+function vvvvvyw(add_php_before_delete_vvvvvyw)
 {
 	// set the function logic
-	if (add_php_before_delete_vvvvvyv == 1)
+	if (add_php_before_delete_vvvvvyw == 1)
 	{
 		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
 	}
@@ -459,11 +459,11 @@ function vvvvvyv(add_php_before_delete_vvvvvyv)
 	}
 }
 
-// the vvvvvyw function
+// the vvvvvyx function
-function vvvvvyw(add_php_after_delete_vvvvvyw)
+function vvvvvyx(add_php_after_delete_vvvvvyx)
 {
 	// set the function logic
-	if (add_php_after_delete_vvvvvyw == 1)
+	if (add_php_after_delete_vvvvvyx == 1)
 	{
 		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
 	}
@@ -473,11 +473,11 @@ function vvvvvyw(add_php_after_delete_vvvvvyw)
 	}
 }
 
-// the vvvvvyx function
+// the vvvvvyy function
-function vvvvvyx(add_php_document_vvvvvyx)
+function vvvvvyy(add_php_document_vvvvvyy)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyx == 1)
+	if (add_php_document_vvvvvyy == 1)
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 	}
@@ -487,75 +487,75 @@ function vvvvvyx(add_php_document_vvvvvyx)
 	}
 }
 
-// the vvvvvyy function
+// the vvvvvyz function
-function vvvvvyy(add_sql_vvvvvyy)
+function vvvvvyz(add_sql_vvvvvyz)
 {
 	// set the function logic
-	if (add_sql_vvvvvyy == 1)
+	if (add_sql_vvvvvyz == 1)
 	{
 		jQuery('#jform_source').closest('.control-group').show();
 		// add required attribute to source field
-		if (jform_vvvvvyyvwh_required)
+		if (jform_vvvvvyzvwh_required)
 		{
 			updateFieldRequired('source',0);
 			jQuery('#jform_source').prop('required','required');
 			jQuery('#jform_source').attr('aria-required',true);
 			jQuery('#jform_source').addClass('required');
-			jform_vvvvvyyvwh_required = false;
+			jform_vvvvvyzvwh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_source').closest('.control-group').hide();
 		// remove required attribute from source field
-		if (!jform_vvvvvyyvwh_required)
+		if (!jform_vvvvvyzvwh_required)
 		{
 			updateFieldRequired('source',1);
 			jQuery('#jform_source').removeAttr('required');
 			jQuery('#jform_source').removeAttr('aria-required');
 			jQuery('#jform_source').removeClass('required');
-			jform_vvvvvyyvwh_required = true;
+			jform_vvvvvyzvwh_required = true;
 		}
 	}
 }
 
-// the vvvvvyz function
+// the vvvvvza function
-function vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz)
+function vvvvvza(source_vvvvvza,add_sql_vvvvvza)
 {
 	// set the function logic
-	if (source_vvvvvyz == 2 && add_sql_vvvvvyz == 1)
+	if (source_vvvvvza == 2 && add_sql_vvvvvza == 1)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvyzvwi_required)
+		if (jform_vvvvvzavwi_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvyzvwi_required = false;
+			jform_vvvvvzavwi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvyzvwi_required)
+		if (!jform_vvvvvzavwi_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvyzvwi_required = true;
+			jform_vvvvvzavwi_required = true;
 		}
 	}
 }
 
-// the vvvvvzb function
+// the vvvvvzc function
-function vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb)
+function vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc)
 {
 	// set the function logic
-	if (source_vvvvvzb == 1 && add_sql_vvvvvzb == 1)
+	if (source_vvvvvzc == 1 && add_sql_vvvvvzc == 1)
 	{
 		jQuery('#jform_addtables-lbl').closest('.control-group').show();
 	}
@@ -565,165 +565,165 @@ function vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb)
 	}
 }
 
-// the vvvvvzd function
+// the vvvvvze function
-function vvvvvzd(add_custom_import_vvvvvzd)
+function vvvvvze(add_custom_import_vvvvvze)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvzd == 1)
+	if (add_custom_import_vvvvvze == 1)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
 		// add required attribute to html_import_view field
-		if (jform_vvvvvzdvwj_required)
+		if (jform_vvvvvzevwj_required)
 		{
 			updateFieldRequired('html_import_view',0);
 			jQuery('#jform_html_import_view').prop('required','required');
 			jQuery('#jform_html_import_view').attr('aria-required',true);
 			jQuery('#jform_html_import_view').addClass('required');
-			jform_vvvvvzdvwj_required = false;
+			jform_vvvvvzevwj_required = false;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
 		// add required attribute to php_import_display field
-		if (jform_vvvvvzdvwk_required)
+		if (jform_vvvvvzevwk_required)
 		{
 			updateFieldRequired('php_import_display',0);
 			jQuery('#jform_php_import_display').prop('required','required');
 			jQuery('#jform_php_import_display').attr('aria-required',true);
 			jQuery('#jform_php_import_display').addClass('required');
-			jform_vvvvvzdvwk_required = false;
+			jform_vvvvvzevwk_required = false;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
 		// add required attribute to php_import_ext field
-		if (jform_vvvvvzdvwl_required)
+		if (jform_vvvvvzevwl_required)
 		{
 			updateFieldRequired('php_import_ext',0);
 			jQuery('#jform_php_import_ext').prop('required','required');
 			jQuery('#jform_php_import_ext').attr('aria-required',true);
 			jQuery('#jform_php_import_ext').addClass('required');
-			jform_vvvvvzdvwl_required = false;
+			jform_vvvvvzevwl_required = false;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		// add required attribute to php_import_headers field
-		if (jform_vvvvvzdvwm_required)
+		if (jform_vvvvvzevwm_required)
 		{
 			updateFieldRequired('php_import_headers',0);
 			jQuery('#jform_php_import_headers').prop('required','required');
 			jQuery('#jform_php_import_headers').attr('aria-required',true);
 			jQuery('#jform_php_import_headers').addClass('required');
-			jform_vvvvvzdvwm_required = false;
+			jform_vvvvvzevwm_required = false;
 		}
 		jQuery('#jform_php_import').closest('.control-group').show();
 		// add required attribute to php_import field
-		if (jform_vvvvvzdvwn_required)
+		if (jform_vvvvvzevwn_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvzdvwn_required = false;
+			jform_vvvvvzevwn_required = false;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').show();
 		// add required attribute to php_import_save field
-		if (jform_vvvvvzdvwo_required)
+		if (jform_vvvvvzevwo_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvvzdvwo_required = false;
+			jform_vvvvvzevwo_required = false;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
 		// add required attribute to php_import_setdata field
-		if (jform_vvvvvzdvwp_required)
+		if (jform_vvvvvzevwp_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvvzdvwp_required = false;
+			jform_vvvvvzevwp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
 		// remove required attribute from html_import_view field
-		if (!jform_vvvvvzdvwj_required)
+		if (!jform_vvvvvzevwj_required)
 		{
 			updateFieldRequired('html_import_view',1);
 			jQuery('#jform_html_import_view').removeAttr('required');
 			jQuery('#jform_html_import_view').removeAttr('aria-required');
 			jQuery('#jform_html_import_view').removeClass('required');
-			jform_vvvvvzdvwj_required = true;
+			jform_vvvvvzevwj_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
 		// remove required attribute from php_import_display field
-		if (!jform_vvvvvzdvwk_required)
+		if (!jform_vvvvvzevwk_required)
 		{
 			updateFieldRequired('php_import_display',1);
 			jQuery('#jform_php_import_display').removeAttr('required');
 			jQuery('#jform_php_import_display').removeAttr('aria-required');
 			jQuery('#jform_php_import_display').removeClass('required');
-			jform_vvvvvzdvwk_required = true;
+			jform_vvvvvzevwk_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
 		// remove required attribute from php_import_ext field
-		if (!jform_vvvvvzdvwl_required)
+		if (!jform_vvvvvzevwl_required)
 		{
 			updateFieldRequired('php_import_ext',1);
 			jQuery('#jform_php_import_ext').removeAttr('required');
 			jQuery('#jform_php_import_ext').removeAttr('aria-required');
 			jQuery('#jform_php_import_ext').removeClass('required');
-			jform_vvvvvzdvwl_required = true;
+			jform_vvvvvzevwl_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		// remove required attribute from php_import_headers field
-		if (!jform_vvvvvzdvwm_required)
+		if (!jform_vvvvvzevwm_required)
 		{
 			updateFieldRequired('php_import_headers',1);
 			jQuery('#jform_php_import_headers').removeAttr('required');
 			jQuery('#jform_php_import_headers').removeAttr('aria-required');
 			jQuery('#jform_php_import_headers').removeClass('required');
-			jform_vvvvvzdvwm_required = true;
+			jform_vvvvvzevwm_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
 		// remove required attribute from php_import field
-		if (!jform_vvvvvzdvwn_required)
+		if (!jform_vvvvvzevwn_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvzdvwn_required = true;
+			jform_vvvvvzevwn_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
 		// remove required attribute from php_import_save field
-		if (!jform_vvvvvzdvwo_required)
+		if (!jform_vvvvvzevwo_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvvzdvwo_required = true;
+			jform_vvvvvzevwo_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
 		// remove required attribute from php_import_setdata field
-		if (!jform_vvvvvzdvwp_required)
+		if (!jform_vvvvvzevwp_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvvzdvwp_required = true;
+			jform_vvvvvzevwp_required = true;
 		}
 	}
 }
 
-// the vvvvvze function
+// the vvvvvzf function
-function vvvvvze(add_custom_import_vvvvvze)
+function vvvvvzf(add_custom_import_vvvvvzf)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvze == 0)
+	if (add_custom_import_vvvvvzf == 0)
 	{
 		jQuery('.note_beginner_import').closest('.control-group').show();
 	}
@@ -733,11 +733,11 @@ function vvvvvze(add_custom_import_vvvvvze)
 	}
 }
 
-// the vvvvvzf function
+// the vvvvvzg function
-function vvvvvzf(add_custom_button_vvvvvzf)
+function vvvvvzg(add_custom_button_vvvvvzg)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvzf == 1)
+	if (add_custom_button_vvvvvzg == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();

admin/models/forms/class_method.js

@@ -9,29 +9,29 @@
  */
 
 // Some Global Values
-jform_vvvvwbjvxi_required = false;
+jform_vvvvwbkvxi_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbk = jQuery("#jform_extension_type").val();
-	vvvvwbj(extension_type_vvvvwbj);
+	vvvvwbk(extension_type_vvvvwbk);
 });
 
-// the vvvvwbj function
+// the vvvvwbk function
-function vvvvwbj(extension_type_vvvvwbj)
+function vvvvwbk(extension_type_vvvvwbk)
 {
-	if (isSet(extension_type_vvvvwbj) && extension_type_vvvvwbj.constructor !== Array)
+	if (isSet(extension_type_vvvvwbk) && extension_type_vvvvwbk.constructor !== Array)
 	{
-		var temp_vvvvwbj = extension_type_vvvvwbj;
+		var temp_vvvvwbk = extension_type_vvvvwbk;
-		var extension_type_vvvvwbj = [];
+		var extension_type_vvvvwbk = [];
-		extension_type_vvvvwbj.push(temp_vvvvwbj);
+		extension_type_vvvvwbk.push(temp_vvvvwbk);
 	}
-	else if (!isSet(extension_type_vvvvwbj))
+	else if (!isSet(extension_type_vvvvwbk))
 	{
-		var extension_type_vvvvwbj = [];
+		var extension_type_vvvvwbk = [];
 	}
-	var extension_type = extension_type_vvvvwbj.some(extension_type_vvvvwbj_SomeFunc);
+	var extension_type = extension_type_vvvvwbk.some(extension_type_vvvvwbk_SomeFunc);
 
 
 	// set this function logic
@@ -39,35 +39,35 @@ function vvvvwbj(extension_type_vvvvwbj)
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').show();
 		// add required attribute to joomla_plugin_group field
-		if (jform_vvvvwbjvxi_required)
+		if (jform_vvvvwbkvxi_required)
 		{
 			updateFieldRequired('joomla_plugin_group',0);
 			jQuery('#jform_joomla_plugin_group').prop('required','required');
 			jQuery('#jform_joomla_plugin_group').attr('aria-required',true);
 			jQuery('#jform_joomla_plugin_group').addClass('required');
-			jform_vvvvwbjvxi_required = false;
+			jform_vvvvwbkvxi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').hide();
 		// remove required attribute from joomla_plugin_group field
-		if (!jform_vvvvwbjvxi_required)
+		if (!jform_vvvvwbkvxi_required)
 		{
 			updateFieldRequired('joomla_plugin_group',1);
 			jQuery('#jform_joomla_plugin_group').removeAttr('required');
 			jQuery('#jform_joomla_plugin_group').removeAttr('aria-required');
 			jQuery('#jform_joomla_plugin_group').removeClass('required');
-			jform_vvvvwbjvxi_required = true;
+			jform_vvvvwbkvxi_required = true;
 		}
 	}
 }
 
-// the vvvvwbj Some function
+// the vvvvwbk Some function
-function extension_type_vvvvwbj_SomeFunc(extension_type_vvvvwbj)
+function extension_type_vvvvwbk_SomeFunc(extension_type_vvvvwbk)
 {
 	// set the function logic
-	if (extension_type_vvvvwbj == 'plugins' || extension_type_vvvvwbj == 'plugin')
+	if (extension_type_vvvvwbk == 'plugins' || extension_type_vvvvwbk == 'plugin')
 	{
 		return true;
 	}

admin/models/forms/class_property.js

@@ -9,29 +9,29 @@
  */
 
 // Some Global Values
-jform_vvvvwbivxh_required = false;
+jform_vvvvwbjvxh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var extension_type_vvvvwbi = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
-	vvvvwbi(extension_type_vvvvwbi);
+	vvvvwbj(extension_type_vvvvwbj);
 });
 
-// the vvvvwbi function
+// the vvvvwbj function
-function vvvvwbi(extension_type_vvvvwbi)
+function vvvvwbj(extension_type_vvvvwbj)
 {
-	if (isSet(extension_type_vvvvwbi) && extension_type_vvvvwbi.constructor !== Array)
+	if (isSet(extension_type_vvvvwbj) && extension_type_vvvvwbj.constructor !== Array)
 	{
-		var temp_vvvvwbi = extension_type_vvvvwbi;
+		var temp_vvvvwbj = extension_type_vvvvwbj;
-		var extension_type_vvvvwbi = [];
+		var extension_type_vvvvwbj = [];
-		extension_type_vvvvwbi.push(temp_vvvvwbi);
+		extension_type_vvvvwbj.push(temp_vvvvwbj);
 	}
-	else if (!isSet(extension_type_vvvvwbi))
+	else if (!isSet(extension_type_vvvvwbj))
 	{
-		var extension_type_vvvvwbi = [];
+		var extension_type_vvvvwbj = [];
 	}
-	var extension_type = extension_type_vvvvwbi.some(extension_type_vvvvwbi_SomeFunc);
+	var extension_type = extension_type_vvvvwbj.some(extension_type_vvvvwbj_SomeFunc);
 
 
 	// set this function logic
@@ -39,35 +39,35 @@ function vvvvwbi(extension_type_vvvvwbi)
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').show();
 		// add required attribute to joomla_plugin_group field
-		if (jform_vvvvwbivxh_required)
+		if (jform_vvvvwbjvxh_required)
 		{
 			updateFieldRequired('joomla_plugin_group',0);
 			jQuery('#jform_joomla_plugin_group').prop('required','required');
 			jQuery('#jform_joomla_plugin_group').attr('aria-required',true);
 			jQuery('#jform_joomla_plugin_group').addClass('required');
-			jform_vvvvwbivxh_required = false;
+			jform_vvvvwbjvxh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').hide();
 		// remove required attribute from joomla_plugin_group field
-		if (!jform_vvvvwbivxh_required)
+		if (!jform_vvvvwbjvxh_required)
 		{
 			updateFieldRequired('joomla_plugin_group',1);
 			jQuery('#jform_joomla_plugin_group').removeAttr('required');
 			jQuery('#jform_joomla_plugin_group').removeAttr('aria-required');
 			jQuery('#jform_joomla_plugin_group').removeClass('required');
-			jform_vvvvwbivxh_required = true;
+			jform_vvvvwbjvxh_required = true;
 		}
 	}
 }
 
-// the vvvvwbi Some function
+// the vvvvwbj Some function
-function extension_type_vvvvwbi_SomeFunc(extension_type_vvvvwbi)
+function extension_type_vvvvwbj_SomeFunc(extension_type_vvvvwbj)
 {
 	// set the function logic
-	if (extension_type_vvvvwbi == 'plugins' || extension_type_vvvvwbi == 'plugin')
+	if (extension_type_vvvvwbj == 'plugins' || extension_type_vvvvwbj == 'plugin')
 	{
 		return true;
 	}

admin/models/forms/custom_admin_view.js

@@ -11,42 +11,42 @@
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzg(add_php_view_vvvvvzg);
+	vvvvvzh(add_php_view_vvvvvzh);
 
-	var add_php_jview_display_vvvvvzh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzh(add_php_jview_display_vvvvvzh);
+	vvvvvzi(add_php_jview_display_vvvvvzi);
 
-	var add_php_jview_vvvvvzi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzi(add_php_jview_vvvvvzi);
+	vvvvvzj(add_php_jview_vvvvvzj);
 
-	var add_php_document_vvvvvzj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzj(add_php_document_vvvvvzj);
+	vvvvvzk(add_php_document_vvvvvzk);
 
-	var add_css_document_vvvvvzk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzk(add_css_document_vvvvvzk);
+	vvvvvzl(add_css_document_vvvvvzl);
 
-	var add_javascript_file_vvvvvzl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzm = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzl(add_javascript_file_vvvvvzl);
+	vvvvvzm(add_javascript_file_vvvvvzm);
 
-	var add_js_document_vvvvvzm = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzm(add_js_document_vvvvvzm);
+	vvvvvzn(add_js_document_vvvvvzn);
 
-	var add_custom_button_vvvvvzn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzn(add_custom_button_vvvvvzn);
+	vvvvvzo(add_custom_button_vvvvvzo);
 
-	var add_css_vvvvvzo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzo(add_css_vvvvvzo);
+	vvvvvzp(add_css_vvvvvzp);
 
-	var add_php_ajax_vvvvvzp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzp(add_php_ajax_vvvvvzp);
+	vvvvvzq(add_php_ajax_vvvvvzq);
 });
 
-// the vvvvvzg function
+// the vvvvvzh function
-function vvvvvzg(add_php_view_vvvvvzg)
+function vvvvvzh(add_php_view_vvvvvzh)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzg == 1)
+	if (add_php_view_vvvvvzh == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 	}
@@ -56,11 +56,11 @@ function vvvvvzg(add_php_view_vvvvvzg)
 	}
 }
 
-// the vvvvvzh function
+// the vvvvvzi function
-function vvvvvzh(add_php_jview_display_vvvvvzh)
+function vvvvvzi(add_php_jview_display_vvvvvzi)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvzh == 1)
+	if (add_php_jview_display_vvvvvzi == 1)
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 	}
@@ -70,11 +70,11 @@ function vvvvvzh(add_php_jview_display_vvvvvzh)
 	}
 }
 
-// the vvvvvzi function
+// the vvvvvzj function
-function vvvvvzi(add_php_jview_vvvvvzi)
+function vvvvvzj(add_php_jview_vvvvvzj)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvzi == 1)
+	if (add_php_jview_vvvvvzj == 1)
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 	}
@@ -84,11 +84,11 @@ function vvvvvzi(add_php_jview_vvvvvzi)
 	}
 }
 
-// the vvvvvzj function
+// the vvvvvzk function
-function vvvvvzj(add_php_document_vvvvvzj)
+function vvvvvzk(add_php_document_vvvvvzk)
 {
 	// set the function logic
-	if (add_php_document_vvvvvzj == 1)
+	if (add_php_document_vvvvvzk == 1)
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 	}
@@ -98,11 +98,11 @@ function vvvvvzj(add_php_document_vvvvvzj)
 	}
 }
 
-// the vvvvvzk function
+// the vvvvvzl function
-function vvvvvzk(add_css_document_vvvvvzk)
+function vvvvvzl(add_css_document_vvvvvzl)
 {
 	// set the function logic
-	if (add_css_document_vvvvvzk == 1)
+	if (add_css_document_vvvvvzl == 1)
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 	}
@@ -112,11 +112,11 @@ function vvvvvzk(add_css_document_vvvvvzk)
 	}
 }
 
-// the vvvvvzl function
+// the vvvvvzm function
-function vvvvvzl(add_javascript_file_vvvvvzl)
+function vvvvvzm(add_javascript_file_vvvvvzm)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvzl == 1)
+	if (add_javascript_file_vvvvvzm == 1)
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 	}
@@ -126,11 +126,11 @@ function vvvvvzl(add_javascript_file_vvvvvzl)
 	}
 }
 
-// the vvvvvzm function
+// the vvvvvzn function
-function vvvvvzm(add_js_document_vvvvvzm)
+function vvvvvzn(add_js_document_vvvvvzn)
 {
 	// set the function logic
-	if (add_js_document_vvvvvzm == 1)
+	if (add_js_document_vvvvvzn == 1)
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').show();
 	}
@@ -140,11 +140,11 @@ function vvvvvzm(add_js_document_vvvvvzm)
 	}
 }
 
-// the vvvvvzn function
+// the vvvvvzo function
-function vvvvvzn(add_custom_button_vvvvvzn)
+function vvvvvzo(add_custom_button_vvvvvzo)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvzn == 1)
+	if (add_custom_button_vvvvvzo == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
@@ -158,11 +158,11 @@ function vvvvvzn(add_custom_button_vvvvvzn)
 	}
 }
 
-// the vvvvvzo function
+// the vvvvvzp function
-function vvvvvzo(add_css_vvvvvzo)
+function vvvvvzp(add_css_vvvvvzp)
 {
 	// set the function logic
-	if (add_css_vvvvvzo == 1)
+	if (add_css_vvvvvzp == 1)
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').show();
 	}
@@ -172,11 +172,11 @@ function vvvvvzo(add_css_vvvvvzo)
 	}
 }
 
-// the vvvvvzp function
+// the vvvvvzq function
-function vvvvvzp(add_php_ajax_vvvvvzp)
+function vvvvvzq(add_php_ajax_vvvvvzq)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvzp == 1)
+	if (add_php_ajax_vvvvvzq == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();

admin/models/forms/custom_code.js

@@ -9,44 +9,44 @@
  */
 
 // Some Global Values
-jform_vvvvwbevxd_required = false;
+jform_vvvvwbfvxd_required = false;
-jform_vvvvwbfvxe_required = false;
+jform_vvvvwbgvxe_required = false;
-jform_vvvvwbfvxf_required = false;
+jform_vvvvwbgvxf_required = false;
-jform_vvvvwbfvxg_required = false;
+jform_vvvvwbgvxg_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwbe = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbe(target_vvvvwbe);
-
 	var target_vvvvwbf = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwbf(target_vvvvwbf);
 
 	var target_vvvvwbg = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwbg = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbg(target_vvvvwbg);
-	vvvvwbg(target_vvvvwbg,type_vvvvwbg);
 
-	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbh(type_vvvvwbh,target_vvvvwbh);
+	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbh(target_vvvvwbh,type_vvvvwbh);
+
+	var type_vvvvwbi = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbi(type_vvvvwbi,target_vvvvwbi);
 });
 
-// the vvvvwbe function
+// the vvvvwbf function
-function vvvvwbe(target_vvvvwbe)
+function vvvvwbf(target_vvvvwbf)
 {
 	// set the function logic
-	if (target_vvvvwbe == 2)
+	if (target_vvvvwbf == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwbevxd_required)
+		if (jform_vvvvwbfvxd_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_vvvvwbevxd_required = false;
+			jform_vvvvwbfvxd_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,102 +55,102 @@ function vvvvwbe(target_vvvvwbe)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwbevxd_required)
+		if (!jform_vvvvwbfvxd_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_vvvvwbevxd_required = true;
+			jform_vvvvwbfvxd_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwbf function
+// the vvvvwbg function
-function vvvvwbf(target_vvvvwbf)
+function vvvvwbg(target_vvvvwbg)
 {
 	// set the function logic
-	if (target_vvvvwbf == 1)
+	if (target_vvvvwbg == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwbfvxe_required)
+		if (jform_vvvvwbgvxe_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwbfvxe_required = false;
+			jform_vvvvwbgvxe_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwbfvxf_required)
+		if (jform_vvvvwbgvxf_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwbfvxf_required = false;
+			jform_vvvvwbgvxf_required = false;
 		}
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwbfvxg_required)
+		if (jform_vvvvwbgvxg_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwbfvxg_required = false;
+			jform_vvvvwbgvxg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwbfvxe_required)
+		if (!jform_vvvvwbgvxe_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwbfvxe_required = true;
+			jform_vvvvwbgvxe_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwbfvxf_required)
+		if (!jform_vvvvwbgvxf_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwbfvxf_required = true;
+			jform_vvvvwbgvxf_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwbfvxg_required)
+		if (!jform_vvvvwbgvxg_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwbfvxg_required = true;
+			jform_vvvvwbgvxg_required = true;
 		}
 	}
 }
 
-// the vvvvwbg function
+// the vvvvwbh function
-function vvvvwbg(target_vvvvwbg,type_vvvvwbg)
+function vvvvwbh(target_vvvvwbh,type_vvvvwbh)
 {
 	// set the function logic
-	if (target_vvvvwbg == 1 && type_vvvvwbg == 1)
+	if (target_vvvvwbh == 1 && type_vvvvwbh == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -162,11 +162,11 @@ function vvvvwbg(target_vvvvwbg,type_vvvvwbg)
 	}
 }
 
-// the vvvvwbh function
+// the vvvvwbi function
-function vvvvwbh(type_vvvvwbh,target_vvvvwbh)
+function vvvvwbi(type_vvvvwbi,target_vvvvwbi)
 {
 	// set the function logic
-	if (type_vvvvwbh == 1 && target_vvvvwbh == 1)
+	if (type_vvvvwbi == 1 && target_vvvvwbi == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -9,57 +9,57 @@
  */
 
 // Some Global Values
-jform_vvvvwbsvxl_required = false;
+jform_vvvvwbtvxl_required = false;
-jform_vvvvwbtvxm_required = false;
+jform_vvvvwbuvxm_required = false;
-jform_vvvvwbuvxn_required = false;
+jform_vvvvwbvvxn_required = false;
-jform_vvvvwbvvxo_required = false;
+jform_vvvvwbwvxo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbs = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
-	vvvvwbs(datalenght_vvvvwbs);
+	vvvvwbt(datalenght_vvvvwbt);
 
-	var datadefault_vvvvwbt = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
-	vvvvwbt(datadefault_vvvvwbt);
+	vvvvwbu(datadefault_vvvvwbu);
-
-	var datatype_vvvvwbu = jQuery("#jform_datatype").val();
-	vvvvwbu(datatype_vvvvwbu);
 
 	var datatype_vvvvwbv = jQuery("#jform_datatype").val();
 	vvvvwbv(datatype_vvvvwbv);
 
-	var store_vvvvwbw = jQuery("#jform_store").val();
 	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(store_vvvvwbw,datatype_vvvvwbw);
+	vvvvwbw(datatype_vvvvwbw);
 
-	var add_css_view_vvvvwby = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var store_vvvvwbx = jQuery("#jform_store").val();
-	vvvvwby(add_css_view_vvvvwby);
+	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
 
-	var add_css_views_vvvvwbz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwbz(add_css_views_vvvvwbz);
+	vvvvwbz(add_css_view_vvvvwbz);
 
-	var add_javascript_view_footer_vvvvwca = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwca(add_javascript_view_footer_vvvvwca);
+	vvvvwca(add_css_views_vvvvwca);
 
-	var add_javascript_views_footer_vvvvwcb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_views_footer_vvvvwcb);
+	vvvvwcb(add_javascript_view_footer_vvvvwcb);
+
+	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwcc(add_javascript_views_footer_vvvvwcc);
 });
 
-// the vvvvwbs function
+// the vvvvwbt function
-function vvvvwbs(datalenght_vvvvwbs)
+function vvvvwbt(datalenght_vvvvwbt)
 {
-	if (isSet(datalenght_vvvvwbs) && datalenght_vvvvwbs.constructor !== Array)
+	if (isSet(datalenght_vvvvwbt) && datalenght_vvvvwbt.constructor !== Array)
 	{
-		var temp_vvvvwbs = datalenght_vvvvwbs;
+		var temp_vvvvwbt = datalenght_vvvvwbt;
-		var datalenght_vvvvwbs = [];
+		var datalenght_vvvvwbt = [];
-		datalenght_vvvvwbs.push(temp_vvvvwbs);
+		datalenght_vvvvwbt.push(temp_vvvvwbt);
 	}
-	else if (!isSet(datalenght_vvvvwbs))
+	else if (!isSet(datalenght_vvvvwbt))
 	{
-		var datalenght_vvvvwbs = [];
+		var datalenght_vvvvwbt = [];
 	}
-	var datalenght = datalenght_vvvvwbs.some(datalenght_vvvvwbs_SomeFunc);
+	var datalenght = datalenght_vvvvwbt.some(datalenght_vvvvwbt_SomeFunc);
 
 
 	// set this function logic
@@ -67,91 +67,35 @@ function vvvvwbs(datalenght_vvvvwbs)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbsvxl_required)
+		if (jform_vvvvwbtvxl_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_vvvvwbsvxl_required = false;
+			jform_vvvvwbtvxl_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbsvxl_required)
+		if (!jform_vvvvwbtvxl_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_vvvvwbsvxl_required = true;
+			jform_vvvvwbtvxl_required = true;
-		}
-	}
-}
-
-// the vvvvwbs Some function
-function datalenght_vvvvwbs_SomeFunc(datalenght_vvvvwbs)
-{
-	// set the function logic
-	if (datalenght_vvvvwbs == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbt function
-function vvvvwbt(datadefault_vvvvwbt)
-{
-	if (isSet(datadefault_vvvvwbt) && datadefault_vvvvwbt.constructor !== Array)
-	{
-		var temp_vvvvwbt = datadefault_vvvvwbt;
-		var datadefault_vvvvwbt = [];
-		datadefault_vvvvwbt.push(temp_vvvvwbt);
-	}
-	else if (!isSet(datadefault_vvvvwbt))
-	{
-		var datadefault_vvvvwbt = [];
-	}
-	var datadefault = datadefault_vvvvwbt.some(datadefault_vvvvwbt_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		// add required attribute to datadefault_other field
-		if (jform_vvvvwbtvxm_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_vvvvwbtvxm_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbtvxm_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_vvvvwbtvxm_required = true;
 		}
 	}
 }
 
 // the vvvvwbt Some function
-function datadefault_vvvvwbt_SomeFunc(datadefault_vvvvwbt)
+function datalenght_vvvvwbt_SomeFunc(datalenght_vvvvwbt)
 {
 	// set the function logic
-	if (datadefault_vvvvwbt == 'Other')
+	if (datalenght_vvvvwbt == 'Other')
 	{
 		return true;
 	}
@@ -159,59 +103,55 @@ function datadefault_vvvvwbt_SomeFunc(datadefault_vvvvwbt)
 }
 
 // the vvvvwbu function
-function vvvvwbu(datatype_vvvvwbu)
+function vvvvwbu(datadefault_vvvvwbu)
 {
-	if (isSet(datatype_vvvvwbu) && datatype_vvvvwbu.constructor !== Array)
+	if (isSet(datadefault_vvvvwbu) && datadefault_vvvvwbu.constructor !== Array)
 	{
-		var temp_vvvvwbu = datatype_vvvvwbu;
+		var temp_vvvvwbu = datadefault_vvvvwbu;
-		var datatype_vvvvwbu = [];
+		var datadefault_vvvvwbu = [];
-		datatype_vvvvwbu.push(temp_vvvvwbu);
+		datadefault_vvvvwbu.push(temp_vvvvwbu);
 	}
-	else if (!isSet(datatype_vvvvwbu))
+	else if (!isSet(datadefault_vvvvwbu))
 	{
-		var datatype_vvvvwbu = [];
+		var datadefault_vvvvwbu = [];
 	}
-	var datatype = datatype_vvvvwbu.some(datatype_vvvvwbu_SomeFunc);
+	var datadefault = datadefault_vvvvwbu.some(datadefault_vvvvwbu_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
+		// add required attribute to datadefault_other field
-		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwbuvxm_required)
-		// add required attribute to indexes field
-		if (jform_vvvvwbuvxn_required)
 		{
-			updateFieldRequired('indexes',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwbuvxn_required = false;
+			jform_vvvvwbuvxm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
+		// remove required attribute from datadefault_other field
-		jQuery('#jform_indexes').closest('.control-group').hide();
+		if (!jform_vvvvwbuvxm_required)
-		// remove required attribute from indexes field
-		if (!jform_vvvvwbuvxn_required)
 		{
-			updateFieldRequired('indexes',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwbuvxn_required = true;
+			jform_vvvvwbuvxm_required = true;
 		}
 	}
 }
 
 // the vvvvwbu Some function
-function datatype_vvvvwbu_SomeFunc(datatype_vvvvwbu)
+function datadefault_vvvvwbu_SomeFunc(datadefault_vvvvwbu)
 {
 	// set the function logic
-	if (datatype_vvvvwbu == 'CHAR' || datatype_vvvvwbu == 'VARCHAR' || datatype_vvvvwbu == 'DATETIME' || datatype_vvvvwbu == 'DATE' || datatype_vvvvwbu == 'TIME' || datatype_vvvvwbu == 'INT' || datatype_vvvvwbu == 'TINYINT' || datatype_vvvvwbu == 'BIGINT' || datatype_vvvvwbu == 'FLOAT' || datatype_vvvvwbu == 'DECIMAL' || datatype_vvvvwbu == 'DOUBLE')
+	if (datadefault_vvvvwbu == 'Other')
 	{
 		return true;
 	}
@@ -237,28 +177,32 @@ function vvvvwbv(datatype_vvvvwbv)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datalenght').closest('.control-group').show();
-		if (jform_vvvvwbvvxo_required)
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
+		if (jform_vvvvwbvvxn_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('indexes',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbvvxo_required = false;
+			jform_vvvvwbvvxn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datalenght').closest('.control-group').hide();
-		if (!jform_vvvvwbvvxo_required)
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
+		if (!jform_vvvvwbvvxn_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('indexes',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbvvxo_required = true;
+			jform_vvvvwbvvxn_required = true;
 		}
 	}
 }
@@ -267,7 +211,7 @@ function vvvvwbv(datatype_vvvvwbv)
 function datatype_vvvvwbv_SomeFunc(datatype_vvvvwbv)
 {
 	// set the function logic
-	if (datatype_vvvvwbv == 'CHAR' || datatype_vvvvwbv == 'VARCHAR' || datatype_vvvvwbv == 'TEXT' || datatype_vvvvwbv == 'MEDIUMTEXT' || datatype_vvvvwbv == 'LONGTEXT' || datatype_vvvvwbv == 'BLOB' || datatype_vvvvwbv == 'TINYBLOB' || datatype_vvvvwbv == 'MEDIUMBLOB' || datatype_vvvvwbv == 'LONGBLOB')
+	if (datatype_vvvvwbv == 'CHAR' || datatype_vvvvwbv == 'VARCHAR' || datatype_vvvvwbv == 'DATETIME' || datatype_vvvvwbv == 'DATE' || datatype_vvvvwbv == 'TIME' || datatype_vvvvwbv == 'INT' || datatype_vvvvwbv == 'TINYINT' || datatype_vvvvwbv == 'BIGINT' || datatype_vvvvwbv == 'FLOAT' || datatype_vvvvwbv == 'DECIMAL' || datatype_vvvvwbv == 'DOUBLE')
 	{
 		return true;
 	}
@@ -275,20 +219,8 @@ function datatype_vvvvwbv_SomeFunc(datatype_vvvvwbv)
 }
 
 // the vvvvwbw function
-function vvvvwbw(store_vvvvwbw,datatype_vvvvwbw)
+function vvvvwbw(datatype_vvvvwbw)
 {
-	if (isSet(store_vvvvwbw) && store_vvvvwbw.constructor !== Array)
-	{
-		var temp_vvvvwbw = store_vvvvwbw;
-		var store_vvvvwbw = [];
-		store_vvvvwbw.push(temp_vvvvwbw);
-	}
-	else if (!isSet(store_vvvvwbw))
-	{
-		var store_vvvvwbw = [];
-	}
-	var store = store_vvvvwbw.some(store_vvvvwbw_SomeFunc);
-
 	if (isSet(datatype_vvvvwbw) && datatype_vvvvwbw.constructor !== Array)
 	{
 		var temp_vvvvwbw = datatype_vvvvwbw;
@@ -303,25 +235,32 @@ function vvvvwbw(store_vvvvwbw,datatype_vvvvwbw)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwbwvxo_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwbwvxo_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
-	}
+		// remove required attribute from store field
-}
+		if (!jform_vvvvwbwvxo_required)
-
-// the vvvvwbw Some function
-function store_vvvvwbw_SomeFunc(store_vvvvwbw)
-{
-	// set the function logic
-	if (store_vvvvwbw == 4)
 		{
-		return true;
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwbwvxo_required = true;
+		}
 	}
-	return false;
 }
 
 // the vvvvwbw Some function
@@ -335,11 +274,72 @@ function datatype_vvvvwbw_SomeFunc(datatype_vvvvwbw)
 	return false;
 }
 
-// the vvvvwby function
+// the vvvvwbx function
-function vvvvwby(add_css_view_vvvvwby)
+function vvvvwbx(store_vvvvwbx,datatype_vvvvwbx)
+{
+	if (isSet(store_vvvvwbx) && store_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = store_vvvvwbx;
+		var store_vvvvwbx = [];
+		store_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(store_vvvvwbx))
+	{
+		var store_vvvvwbx = [];
+	}
+	var store = store_vvvvwbx.some(store_vvvvwbx_SomeFunc);
+
+	if (isSet(datatype_vvvvwbx) && datatype_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = datatype_vvvvwbx;
+		var datatype_vvvvwbx = [];
+		datatype_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(datatype_vvvvwbx))
+	{
+		var datatype_vvvvwbx = [];
+	}
+	var datatype = datatype_vvvvwbx.some(datatype_vvvvwbx_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 vvvvwbx Some function
+function store_vvvvwbx_SomeFunc(store_vvvvwbx)
 {
 	// set the function logic
-	if (add_css_view_vvvvwby == 1)
+	if (store_vvvvwbx == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbx Some function
+function datatype_vvvvwbx_SomeFunc(datatype_vvvvwbx)
+{
+	// set the function logic
+	if (datatype_vvvvwbx == 'CHAR' || datatype_vvvvwbx == 'VARCHAR' || datatype_vvvvwbx == 'TEXT' || datatype_vvvvwbx == 'MEDIUMTEXT' || datatype_vvvvwbx == 'LONGTEXT' || datatype_vvvvwbx == 'BLOB' || datatype_vvvvwbx == 'TINYBLOB' || datatype_vvvvwbx == 'MEDIUMBLOB' || datatype_vvvvwbx == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbz function
+function vvvvwbz(add_css_view_vvvvwbz)
+{
+	// set the function logic
+	if (add_css_view_vvvvwbz == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 	}
@@ -349,11 +349,11 @@ function vvvvwby(add_css_view_vvvvwby)
 	}
 }
 
-// the vvvvwbz function
+// the vvvvwca function
-function vvvvwbz(add_css_views_vvvvwbz)
+function vvvvwca(add_css_views_vvvvwca)
 {
 	// set the function logic
-	if (add_css_views_vvvvwbz == 1)
+	if (add_css_views_vvvvwca == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 	}
@@ -363,11 +363,11 @@ function vvvvwbz(add_css_views_vvvvwbz)
 	}
 }
 
-// the vvvvwca function
+// the vvvvwcb function
-function vvvvwca(add_javascript_view_footer_vvvvwca)
+function vvvvwcb(add_javascript_view_footer_vvvvwcb)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwca == 1)
+	if (add_javascript_view_footer_vvvvwcb == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 	}
@@ -377,11 +377,11 @@ function vvvvwca(add_javascript_view_footer_vvvvwca)
 	}
 }
 
-// the vvvvwcb function
+// the vvvvwcc function
-function vvvvwcb(add_javascript_views_footer_vvvvwcb)
+function vvvvwcc(add_javascript_views_footer_vvvvwcc)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwcb == 1)
+	if (add_javascript_views_footer_vvvvwcc == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 	}

admin/models/forms/help_document.js

@@ -9,23 +9,20 @@
  */
 
 // Some Global Values
-jform_vvvvwcyvyh_required = false;
+jform_vvvvwczvyh_required = false;
-jform_vvvvwczvyi_required = false;
+jform_vvvvwdavyi_required = false;
-jform_vvvvwdavyj_required = false;
+jform_vvvvwdbvyj_required = false;
-jform_vvvvwdbvyk_required = false;
+jform_vvvvwdcvyk_required = false;
-jform_vvvvwddvyl_required = false;
+jform_vvvvwdevyl_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwcy = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcy(location_vvvvwcy);
-
 	var location_vvvvwcz = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwcz(location_vvvvwcz);
 
-	var type_vvvvwda = jQuery("#jform_type").val();
+	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(type_vvvvwda);
+	vvvvwda(location_vvvvwda);
 
 	var type_vvvvwdb = jQuery("#jform_type").val();
 	vvvvwdb(type_vvvvwdb);
@@ -33,130 +30,77 @@ jQuery(document).ready(function()
 	var type_vvvvwdc = jQuery("#jform_type").val();
 	vvvvwdc(type_vvvvwdc);
 
-	var target_vvvvwdd = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwdd = jQuery("#jform_type").val();
-	vvvvwdd(target_vvvvwdd);
+	vvvvwdd(type_vvvvwdd);
+
+	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwde(target_vvvvwde);
 });
 
-// the vvvvwcy function
+// the vvvvwcz function
-function vvvvwcy(location_vvvvwcy)
+function vvvvwcz(location_vvvvwcz)
 {
 	// set the function logic
-	if (location_vvvvwcy == 1)
+	if (location_vvvvwcz == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwcyvyh_required)
+		if (jform_vvvvwczvyh_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_vvvvwcyvyh_required = false;
+			jform_vvvvwczvyh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwcyvyh_required)
+		if (!jform_vvvvwczvyh_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_vvvvwcyvyh_required = true;
+			jform_vvvvwczvyh_required = true;
 		}
 	}
 }
 
-// the vvvvwcz function
+// the vvvvwda function
-function vvvvwcz(location_vvvvwcz)
+function vvvvwda(location_vvvvwda)
 {
 	// set the function logic
-	if (location_vvvvwcz == 2)
+	if (location_vvvvwda == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwczvyi_required)
+		if (jform_vvvvwdavyi_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_vvvvwczvyi_required = false;
+			jform_vvvvwdavyi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwczvyi_required)
+		if (!jform_vvvvwdavyi_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_vvvvwczvyi_required = true;
+			jform_vvvvwdavyi_required = true;
 		}
 	}
 }
 
-// the vvvvwda function
-function vvvvwda(type_vvvvwda)
-{
-	if (isSet(type_vvvvwda) && type_vvvvwda.constructor !== Array)
-	{
-		var temp_vvvvwda = type_vvvvwda;
-		var type_vvvvwda = [];
-		type_vvvvwda.push(temp_vvvvwda);
-	}
-	else if (!isSet(type_vvvvwda))
-	{
-		var type_vvvvwda = [];
-	}
-	var type = type_vvvvwda.some(type_vvvvwda_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to url field
-		if (jform_vvvvwdavyj_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwdavyj_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		// remove required attribute from url field
-		if (!jform_vvvvwdavyj_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwdavyj_required = true;
-		}
-	}
-}
-
-// the vvvvwda Some function
-function type_vvvvwda_SomeFunc(type_vvvvwda)
-{
-	// set the function logic
-	if (type_vvvvwda == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwdb function
 function vvvvwdb(type_vvvvwdb)
 {
@@ -176,28 +120,28 @@ function vvvvwdb(type_vvvvwdb)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to article field
+		// add required attribute to url field
-		if (jform_vvvvwdbvyk_required)
+		if (jform_vvvvwdbvyj_required)
 		{
-			updateFieldRequired('article',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			jQuery('#jform_url').addClass('required');
-			jform_vvvvwdbvyk_required = false;
+			jform_vvvvwdbvyj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
-		// remove required attribute from article field
+		// remove required attribute from url field
-		if (!jform_vvvvwdbvyk_required)
+		if (!jform_vvvvwdbvyj_required)
 		{
-			updateFieldRequired('article',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwdbvyk_required = true;
+			jform_vvvvwdbvyj_required = true;
 		}
 	}
 }
@@ -206,7 +150,7 @@ function vvvvwdb(type_vvvvwdb)
 function type_vvvvwdb_SomeFunc(type_vvvvwdb)
 {
 	// set the function logic
-	if (type_vvvvwdb == 1)
+	if (type_vvvvwdb == 3)
 	{
 		return true;
 	}
@@ -229,6 +173,62 @@ function vvvvwdc(type_vvvvwdc)
 	var type = type_vvvvwdc.some(type_vvvvwdc_SomeFunc);
 
 
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
+		// add required attribute to article field
+		if (jform_vvvvwdcvyk_required)
+		{
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
+			jform_vvvvwdcvyk_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_article').closest('.control-group').hide();
+		// remove required attribute from article field
+		if (!jform_vvvvwdcvyk_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwdcvyk_required = true;
+		}
+	}
+}
+
+// the vvvvwdc Some function
+function type_vvvvwdc_SomeFunc(type_vvvvwdc)
+{
+	// set the function logic
+	if (type_vvvvwdc == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwdd function
+function vvvvwdd(type_vvvvwdd)
+{
+	if (isSet(type_vvvvwdd) && type_vvvvwdd.constructor !== Array)
+	{
+		var temp_vvvvwdd = type_vvvvwdd;
+		var type_vvvvwdd = [];
+		type_vvvvwdd.push(temp_vvvvwdd);
+	}
+	else if (!isSet(type_vvvvwdd))
+	{
+		var type_vvvvwdd = [];
+	}
+	var type = type_vvvvwdd.some(type_vvvvwdd_SomeFunc);
+
+
 	// set this function logic
 	if (type)
 	{
@@ -240,45 +240,45 @@ function vvvvwdc(type_vvvvwdc)
 	}
 }
 
-// the vvvvwdc Some function
+// the vvvvwdd Some function
-function type_vvvvwdc_SomeFunc(type_vvvvwdc)
+function type_vvvvwdd_SomeFunc(type_vvvvwdd)
 {
 	// set the function logic
-	if (type_vvvvwdc == 2)
+	if (type_vvvvwdd == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdd function
+// the vvvvwde function
-function vvvvwdd(target_vvvvwdd)
+function vvvvwde(target_vvvvwde)
 {
 	// set the function logic
-	if (target_vvvvwdd == 1)
+	if (target_vvvvwde == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwddvyl_required)
+		if (jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwddvyl_required = false;
+			jform_vvvvwdevyl_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwddvyl_required)
+		if (!jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwddvyl_required = true;
+			jform_vvvvwdevyl_required = true;
 		}
 	}
 }

admin/models/forms/joomla_plugin.js

@@ -10,9 +10,9 @@
 
 // Some Global Values
 jform_vvvvvxevwd_required = false;
-jform_vvvvvxsvwe_required = false;
+jform_vvvvvxtvwe_required = false;
-jform_vvvvvxtvwf_required = false;
+jform_vvvvvxuvwf_required = false;
-jform_vvvvvxuvwg_required = false;
+jform_vvvvvxvvwg_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -32,57 +32,60 @@ jQuery(document).ready(function()
 	var class_extends_vvvvvxe = jQuery("#jform_class_extends").val();
 	vvvvvxe(add_head_vvvvvxe,class_extends_vvvvvxe);
 
-	var add_php_preflight_install_vvvvvxg = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	var add_php_script_construct_vvvvvxg = jQuery("#jform_add_php_script_construct input[type='radio']:checked").val();
-	vvvvvxg(add_php_preflight_install_vvvvvxg);
+	vvvvvxg(add_php_script_construct_vvvvvxg);
 
-	var add_php_preflight_update_vvvvvxh = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	var add_php_preflight_install_vvvvvxh = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvxh(add_php_preflight_update_vvvvvxh);
+	vvvvvxh(add_php_preflight_install_vvvvvxh);
 
-	var add_php_preflight_uninstall_vvvvvxi = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
+	var add_php_preflight_update_vvvvvxi = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvxi(add_php_preflight_uninstall_vvvvvxi);
+	vvvvvxi(add_php_preflight_update_vvvvvxi);
 
-	var add_php_postflight_install_vvvvvxj = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	var add_php_preflight_uninstall_vvvvvxj = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
-	vvvvvxj(add_php_postflight_install_vvvvvxj);
+	vvvvvxj(add_php_preflight_uninstall_vvvvvxj);
 
-	var add_php_postflight_update_vvvvvxk = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	var add_php_postflight_install_vvvvvxk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvxk(add_php_postflight_update_vvvvvxk);
+	vvvvvxk(add_php_postflight_install_vvvvvxk);
 
-	var add_php_method_uninstall_vvvvvxl = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	var add_php_postflight_update_vvvvvxl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvxl(add_php_method_uninstall_vvvvvxl);
+	vvvvvxl(add_php_postflight_update_vvvvvxl);
 
-	var update_server_target_vvvvvxm = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_php_method_uninstall_vvvvvxm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	var add_update_server_vvvvvxm = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxm(add_php_method_uninstall_vvvvvxm);
-	vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm);
 
-	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn);
+	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn);
 
-	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo);
+	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo);
 
-	var update_server_target_vvvvvxq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var update_server_target_vvvvvxp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq);
+	vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp);
 
-	var add_update_server_vvvvvxs = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvxr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxs(add_update_server_vvvvvxs);
+	var add_update_server_vvvvvxr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr);
 
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_update_server_vvvvvxt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxt(add_sql_vvvvvxt);
+	vvvvvxt(add_update_server_vvvvvxt);
 
-	var add_sql_uninstall_vvvvvxu = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxu(add_sql_uninstall_vvvvvxu);
+	vvvvvxu(add_sql_vvvvvxu);
 
-	var add_update_server_vvvvvxv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_sql_uninstall_vvvvvxv = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
-	vvvvvxv(add_update_server_vvvvvxv);
+	vvvvvxv(add_sql_uninstall_vvvvvxv);
 
-	var add_sales_server_vvvvvxw = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxw = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxw(add_sales_server_vvvvvxw);
+	vvvvvxw(add_update_server_vvvvvxw);
 
-	var addreadme_vvvvvxx = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	var add_sales_server_vvvvvxx = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvxx(addreadme_vvvvvxx);
+	vvvvvxx(add_sales_server_vvvvvxx);
+
+	var addreadme_vvvvvxy = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	vvvvvxy(addreadme_vvvvvxy);
 });
 
 // the vvvvvxb function
@@ -333,10 +336,24 @@ function class_extends_vvvvvxe_SomeFunc(class_extends_vvvvvxe)
 }
 
 // the vvvvvxg function
-function vvvvvxg(add_php_preflight_install_vvvvvxg)
+function vvvvvxg(add_php_script_construct_vvvvvxg)
 {
 	// set the function logic
-	if (add_php_preflight_install_vvvvvxg == 1)
+	if (add_php_script_construct_vvvvvxg == 1)
+	{
+		jQuery('#jform_php_script_construct-lbl').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_php_script_construct-lbl').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvxh function
+function vvvvvxh(add_php_preflight_install_vvvvvxh)
+{
+	// set the function logic
+	if (add_php_preflight_install_vvvvvxh == 1)
 	{
 		jQuery('#jform_php_preflight_install-lbl').closest('.control-group').show();
 	}
@@ -346,11 +363,11 @@ function vvvvvxg(add_php_preflight_install_vvvvvxg)
 	}
 }
 
-// the vvvvvxh function
+// the vvvvvxi function
-function vvvvvxh(add_php_preflight_update_vvvvvxh)
+function vvvvvxi(add_php_preflight_update_vvvvvxi)
 {
 	// set the function logic
-	if (add_php_preflight_update_vvvvvxh == 1)
+	if (add_php_preflight_update_vvvvvxi == 1)
 	{
 		jQuery('#jform_php_preflight_update-lbl').closest('.control-group').show();
 	}
@@ -360,11 +377,11 @@ function vvvvvxh(add_php_preflight_update_vvvvvxh)
 	}
 }
 
-// the vvvvvxi function
+// the vvvvvxj function
-function vvvvvxi(add_php_preflight_uninstall_vvvvvxi)
+function vvvvvxj(add_php_preflight_uninstall_vvvvvxj)
 {
 	// set the function logic
-	if (add_php_preflight_uninstall_vvvvvxi == 1)
+	if (add_php_preflight_uninstall_vvvvvxj == 1)
 	{
 		jQuery('#jform_php_preflight_uninstall-lbl').closest('.control-group').show();
 	}
@@ -374,11 +391,11 @@ function vvvvvxi(add_php_preflight_uninstall_vvvvvxi)
 	}
 }
 
-// the vvvvvxj function
+// the vvvvvxk function
-function vvvvvxj(add_php_postflight_install_vvvvvxj)
+function vvvvvxk(add_php_postflight_install_vvvvvxk)
 {
 	// set the function logic
-	if (add_php_postflight_install_vvvvvxj == 1)
+	if (add_php_postflight_install_vvvvvxk == 1)
 	{
 		jQuery('#jform_php_postflight_install-lbl').closest('.control-group').show();
 	}
@@ -388,11 +405,11 @@ function vvvvvxj(add_php_postflight_install_vvvvvxj)
 	}
 }
 
-// the vvvvvxk function
+// the vvvvvxl function
-function vvvvvxk(add_php_postflight_update_vvvvvxk)
+function vvvvvxl(add_php_postflight_update_vvvvvxl)
 {
 	// set the function logic
-	if (add_php_postflight_update_vvvvvxk == 1)
+	if (add_php_postflight_update_vvvvvxl == 1)
 	{
 		jQuery('#jform_php_postflight_update-lbl').closest('.control-group').show();
 	}
@@ -402,11 +419,11 @@ function vvvvvxk(add_php_postflight_update_vvvvvxk)
 	}
 }
 
-// the vvvvvxl function
+// the vvvvvxm function
-function vvvvvxl(add_php_method_uninstall_vvvvvxl)
+function vvvvvxm(add_php_method_uninstall_vvvvvxm)
 {
 	// set the function logic
-	if (add_php_method_uninstall_vvvvvxl == 1)
+	if (add_php_method_uninstall_vvvvvxm == 1)
 	{
 		jQuery('#jform_php_method_uninstall-lbl').closest('.control-group').show();
 	}
@@ -416,27 +433,11 @@ function vvvvvxl(add_php_method_uninstall_vvvvvxl)
 	}
 }
 
-// the vvvvvxm function
-function vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm)
-{
-	// set the function logic
-	if (update_server_target_vvvvvxm == 1 && add_update_server_vvvvvxm == 1)
-	{
-		jQuery('#jform_update_server').closest('.control-group').show();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_update_server').closest('.control-group').hide();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
-	}
-}
-
 // the vvvvvxn function
-function vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn)
+function vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn)
 {
 	// set the function logic
-	if (add_update_server_vvvvvxn == 1 && update_server_target_vvvvvxn == 1)
+	if (update_server_target_vvvvvxn == 1 && add_update_server_vvvvvxn == 1)
 	{
 		jQuery('#jform_update_server').closest('.control-group').show();
 		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
@@ -449,10 +450,26 @@ function vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn)
 }
 
 // the vvvvvxo function
-function vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo)
+function vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo)
 {
 	// set the function logic
-	if (update_server_target_vvvvvxo == 2 && add_update_server_vvvvvxo == 1)
+	if (add_update_server_vvvvvxo == 1 && update_server_target_vvvvvxo == 1)
+	{
+		jQuery('#jform_update_server').closest('.control-group').show();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_update_server').closest('.control-group').hide();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvxp function
+function vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp)
+{
+	// set the function logic
+	if (update_server_target_vvvvvxp == 2 && add_update_server_vvvvvxp == 1)
 	{
 		jQuery('.note_update_server_note_zip').closest('.control-group').show();
 	}
@@ -462,11 +479,11 @@ function vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo)
 	}
 }
 
-// the vvvvvxq function
+// the vvvvvxr function
-function vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq)
+function vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr)
 {
 	// set the function logic
-	if (update_server_target_vvvvvxq == 3 && add_update_server_vvvvvxq == 1)
+	if (update_server_target_vvvvvxr == 3 && add_update_server_vvvvvxr == 1)
 	{
 		jQuery('.note_update_server_note_other').closest('.control-group').show();
 	}
@@ -476,107 +493,107 @@ function vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq)
 	}
 }
 
-// the vvvvvxs function
+// the vvvvvxt function
-function vvvvvxs(add_update_server_vvvvvxs)
+function vvvvvxt(add_update_server_vvvvvxt)
 {
 	// set the function logic
-	if (add_update_server_vvvvvxs == 1)
+	if (add_update_server_vvvvvxt == 1)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
 		// add required attribute to update_server_target field
-		if (jform_vvvvvxsvwe_required)
+		if (jform_vvvvvxtvwe_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvxsvwe_required = false;
+			jform_vvvvvxtvwe_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		// remove required attribute from update_server_target field
-		if (!jform_vvvvvxsvwe_required)
+		if (!jform_vvvvvxtvwe_required)
 		{
 			updateFieldRequired('update_server_target',1);
 			jQuery('#jform_update_server_target').removeAttr('required');
 			jQuery('#jform_update_server_target').removeAttr('aria-required');
 			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvxsvwe_required = true;
+			jform_vvvvvxtvwe_required = true;
 		}
 	}
 }
 
-// the vvvvvxt function
+// the vvvvvxu function
-function vvvvvxt(add_sql_vvvvvxt)
+function vvvvvxu(add_sql_vvvvvxu)
 {
 	// set the function logic
-	if (add_sql_vvvvvxt == 1)
+	if (add_sql_vvvvvxu == 1)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvxtvwf_required)
+		if (jform_vvvvvxuvwf_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvxtvwf_required = false;
+			jform_vvvvvxuvwf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvxtvwf_required)
+		if (!jform_vvvvvxuvwf_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvxtvwf_required = true;
+			jform_vvvvvxuvwf_required = true;
 		}
 	}
 }
 
-// the vvvvvxu function
+// the vvvvvxv function
-function vvvvvxu(add_sql_uninstall_vvvvvxu)
+function vvvvvxv(add_sql_uninstall_vvvvvxv)
 {
 	// set the function logic
-	if (add_sql_uninstall_vvvvvxu == 1)
+	if (add_sql_uninstall_vvvvvxv == 1)
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').show();
 		// add required attribute to sql_uninstall field
-		if (jform_vvvvvxuvwg_required)
+		if (jform_vvvvvxvvwg_required)
 		{
 			updateFieldRequired('sql_uninstall',0);
 			jQuery('#jform_sql_uninstall').prop('required','required');
 			jQuery('#jform_sql_uninstall').attr('aria-required',true);
 			jQuery('#jform_sql_uninstall').addClass('required');
-			jform_vvvvvxuvwg_required = false;
+			jform_vvvvvxvvwg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').hide();
 		// remove required attribute from sql_uninstall field
-		if (!jform_vvvvvxuvwg_required)
+		if (!jform_vvvvvxvvwg_required)
 		{
 			updateFieldRequired('sql_uninstall',1);
 			jQuery('#jform_sql_uninstall').removeAttr('required');
 			jQuery('#jform_sql_uninstall').removeAttr('aria-required');
 			jQuery('#jform_sql_uninstall').removeClass('required');
-			jform_vvvvvxuvwg_required = true;
+			jform_vvvvvxvvwg_required = true;
 		}
 	}
 }
 
-// the vvvvvxv function
+// the vvvvvxw function
-function vvvvvxv(add_update_server_vvvvvxv)
+function vvvvvxw(add_update_server_vvvvvxw)
 {
 	// set the function logic
-	if (add_update_server_vvvvvxv == 1)
+	if (add_update_server_vvvvvxw == 1)
 	{
 		jQuery('#jform_update_server_url').closest('.control-group').show();
 	}
@@ -586,11 +603,11 @@ function vvvvvxv(add_update_server_vvvvvxv)
 	}
 }
 
-// the vvvvvxw function
+// the vvvvvxx function
-function vvvvvxw(add_sales_server_vvvvvxw)
+function vvvvvxx(add_sales_server_vvvvvxx)
 {
 	// set the function logic
-	if (add_sales_server_vvvvvxw == 1)
+	if (add_sales_server_vvvvvxx == 1)
 	{
 		jQuery('#jform_sales_server').closest('.control-group').show();
 	}
@@ -600,11 +617,11 @@ function vvvvvxw(add_sales_server_vvvvvxw)
 	}
 }
 
-// the vvvvvxx function
+// the vvvvvxy function
-function vvvvvxx(addreadme_vvvvvxx)
+function vvvvvxy(addreadme_vvvvvxy)
 {
 	// set the function logic
-	if (addreadme_vvvvvxx == 1)
+	if (addreadme_vvvvvxy == 1)
 	{
 		jQuery('#jform_readme-lbl').closest('.control-group').show();
 	}

admin/models/forms/joomla_plugin.xml

@@ -121,19 +121,6 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="sql_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_HINT"
-			required="true"
-		/>
 		<!-- Sql Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -195,22 +182,52 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
+		<!-- Description Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
+			type="textarea"
-			name="add_sales_server"
+			name="description"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_LABEL"
-			class="btn-group btn-group-yesno"
+			rows="11"
-			default="0"
+			cols="10"
-			required="true">
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_DESCRIPTION"
-			<!-- Option Set. -->
+			class="text_area span12"
-			<option value="1">
+			filter="HTML"
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_DESCRIPTION_HINT"
-			<option value="0">
+		/>
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		</field>
+		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
-		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Update_server_url Field. Type: Url. (joomla) -->
-		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
+		<field
+			type="url"
+			name="update_server_url"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_LABEL"
+			size="60"
+			maxlength="150"
+			default=""
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_DESCRIPTION"
+			class="text_area span12"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_HINT"
+		/>
+		<!-- Head Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="head"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Method_selection Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -279,6 +296,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
+		<!-- Sql_uninstall Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SQL_UNINSTALL_HINT"
+			required="true"
+		/>
 		<!-- Readme Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -291,40 +321,6 @@
 			editor="none"
 			filter="raw"
 		/>
-		<!-- Update_server_url Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="update_server_url"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_LABEL"
-			size="60"
-			maxlength="150"
-			default=""
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_DESCRIPTION"
-			class="text_area span12"
-			filter="url"
-			validated="url"
-			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_URL_HINT"
-		/>
-		<!-- Head Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="head"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_DESCRIPTION"
-			width="100%"
-			height="100px"
-			cols="15"
-			rows="10"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_update_server_note_other" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_other" />
 		<!-- Main_class_code Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -341,29 +337,15 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Name Field. Type: Text. (joomla) -->
+		<!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla) -->
-		<field
+		<field type="note" name="note_update_server_note_ftp" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION" heading="h4" class="alert alert-success note_update_server_note_ftp" />
-			type="text"
-			name="name"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_LABEL"
-			size="40"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_DESCRIPTION"
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="true"
-			filter="STRING"
-			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_MESSAGE"
-			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_HINT"
-		/>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
+		<!-- Add_sales_server Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_postflight_update"
+			name="add_sales_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SALES_SERVER_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -379,11 +361,40 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_method_uninstall"
+			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Plugin_version Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="plugin_version"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_LABEL"
+			size="40"
+			maxlength="50"
+			default="1.0.0"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="CMD"
+			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN_VERSION_HINT"
+		/>
+		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -432,6 +443,34 @@
 				/>
 			</form>
 		</field>
+		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
+		<!-- Add_php_script_construct Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_script_construct"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_SCRIPT_CONSTRUCT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
 		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -446,6 +485,36 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
+		<!-- Php_script_construct Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_script_construct"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_SCRIPT_CONSTRUCT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_sql_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
+		</field>
 		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -460,14 +529,13 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_sql_uninstall"
+			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_SQL_UNINSTALL_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0"
+			default="0">
-			required="true">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
@@ -490,13 +558,14 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Add_update_server Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="addreadme"
+			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0">
+			default="0"
+			required="true">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
@@ -517,36 +586,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Add_update_server Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_UPDATE_SERVER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
-		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_preflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
 		<!-- Update_server_target Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -564,6 +603,24 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_OTHER</option>
 		</field>
+		<!-- Php_preflight_update Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_preflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
 		<!-- Add_php_preflight_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -578,8 +635,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
 		</field>
-		<!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Update_server Field. Type: Servers. (custom) -->
-		<field type="note" name="note_update_server_note_zip" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION" heading="h4" class="alert alert-info note_update_server_note_zip" />
+		<field
+			type="servers"
+			name="update_server"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="0"
+			button="true"
+		/>
 		<!-- Php_preflight_uninstall Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -596,31 +662,6 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Update_server Field. Type: Servers. (custom) -->
-		<field
-			type="servers"
-			name="update_server"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_DESCRIPTION"
-			class="list_class"
-			multiple="false"
-			default="0"
-			button="true"
-		/>
-		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NO</option>
-		</field>
 		<!-- Sales_server Field. Type: Servers. (custom) -->
 		<field
 			type="servers"
@@ -632,8 +673,22 @@
 			default="0"
 			button="true"
 		/>
-		<!-- Note_beta_stage Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Name Field. Type: Text. (joomla) -->
-		<field type="note" name="note_beta_stage" label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_BETA_STAGE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_BETA_STAGE_DESCRIPTION" heading="h4" class="alert alert-warning  note_beta_stage" />
+		<field
+			type="text"
+			name="name"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NAME_HINT"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/joomla_plugin_updates.js

@@ -0,0 +1,11 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+ 

admin/models/forms/joomla_plugin_updates.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fieldset name="details">
+		<!-- Default Fields. -->
+		<!-- Id Field. Type: Text (joomla) -->
+		<field
+			name="id"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
+			readonly="true"
+		/>
+		<!-- Date Created Field. Type: Calendar (joomla) -->
+		<field
+			name="created"
+			type="calendar"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_DATE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_DATE_DESC"
+			size="22"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+		<!-- User Created Field. Type: User (joomla) -->
+		<field
+			name="created_by"
+			type="user"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_CREATED_BY_DESC"
+		/>
+		<!-- Published Field. Type: List (joomla) -->
+		<field name="published" type="list" label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+			filter="intval" size="1" default="1" >
+			<option value="1">
+				JPUBLISHED</option>
+			<option value="0">
+				JUNPUBLISHED</option>
+			<option value="2">
+				JARCHIVED</option>
+			<option value="-2">
+				JTRASHED</option>
+		</field>
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
+		<field name="modified" type="calendar" class="readonly"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_DATE_DESC"
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
+		<!-- User Modified Field. Type: User (joomla) -->
+		<field name="modified_by" type="user"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+		<!-- Access Field. Type: Accesslevel (joomla) -->
+		<field name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			default="1"
+			required="false"
+		/>
+		<!-- Ordering Field. Type: Numbers (joomla) -->
+		<field
+			name="ordering"
+			type="number"
+			class="inputbox validate-ordering"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ORDERING_LABEL"
+			description=""
+			default="0"
+			size="6"
+			required="false"
+		/>
+		<!-- Version Field. Type: Text (joomla) -->
+		<field
+			name="version"
+			type="text"
+			class="readonly"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESC"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+		<!-- Dynamic Fields. -->
+		<!-- Joomla_plugin Field. Type: Joomlaplugins. (custom) -->
+		<field
+			type="joomlaplugins"
+			name="joomla_plugin"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_JOOMLA_PLUGIN_LABEL"
+			description="JFIELD_TITLE_DESC"
+			class="list_class span12"
+			multiple="false"
+			default="0"
+			readonly="true"
+		/>
+		<!-- Version_update Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="version_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE_DESCRIPTION"
+			default=""
+			icon="list">
+			<form hidden="true" name="list_version_update_modal" repeat="true">
+				<!-- Version Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="version"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_LABEL"
+					size="10"
+					maxlength="50"
+					default=""
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="STRING"
+					message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_MESSAGE"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_VERSION_HINT"
+				/>
+				<!-- Mysql Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="mysql"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_LABEL"
+					rows="30"
+					cols="15"
+					default=""
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_DESCRIPTION"
+					class="text_area mysql_update"
+					filter="raw"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_HINT"
+				/>
+				<!-- Url Field. Type: Url. (joomla) -->
+				<field
+					type="url"
+					name="url"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_LABEL"
+					size="60"
+					maxlength="150"
+					default=""
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_DESCRIPTION"
+					class="text_area version_url"
+					required="true"
+					filter="raw"
+					validated="url"
+					message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_MESSAGE"
+					hint="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_URL_HINT"
+				/>
+			</form>
+		</field>
+	</fieldset>
+	
+	<!-- Access Control Fields. -->
+	<fieldset name="accesscontrol">
+		<!-- Asset Id Field. Type: Hidden (joomla) -->
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset"
+		/>
+		<!-- Rules Field. Type: Rules (joomla) -->
+		<field
+			name="rules"
+			type="rules"
+			label="Permissions in relation to this joomla_plugin_updates"
+			translate_label="false"
+			filter="rules"
+			validate="rules"
+			class="inputbox"
+			component="com_componentbuilder"
+			section="joomla_plugin_updates"
+		/>
+	</fieldset>
+</form>

admin/models/forms/layout.js

@@ -11,15 +11,15 @@
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvwac = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvwad = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvwac(add_php_view_vvvvwac);
+	vvvvwad(add_php_view_vvvvwad);
 });
 
-// the vvvvwac function
+// the vvvvwad function
-function vvvvwac(add_php_view_vvvvwac)
+function vvvvwad(add_php_view_vvvvwad)
 {
 	// set the function logic
-	if (add_php_view_vvvvwac == 1)
+	if (add_php_view_vvvvwad == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 	}

admin/models/forms/library.js

@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwblvxj_required = false;
+jform_vvvvwbmvxj_required = false;
-jform_vvvvwbrvxk_required = false;
+jform_vvvvwbsvxk_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwbk = jQuery("#jform_how").val();
-	vvvvwbk(how_vvvvwbk);
-
 	var how_vvvvwbl = jQuery("#jform_how").val();
 	vvvvwbl(how_vvvvwbl);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwbq = jQuery("#jform_how").val();
 	vvvvwbq(how_vvvvwbq);
 
-	var type_vvvvwbr = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwbr = jQuery("#jform_how").val();
-	vvvvwbr(type_vvvvwbr);
+	vvvvwbr(how_vvvvwbr);
+
+	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbs(type_vvvvwbs);
 });
 
-// the vvvvwbk function
-function vvvvwbk(how_vvvvwbk)
-{
-	if (isSet(how_vvvvwbk) && how_vvvvwbk.constructor !== Array)
-	{
-		var temp_vvvvwbk = how_vvvvwbk;
-		var how_vvvvwbk = [];
-		how_vvvvwbk.push(temp_vvvvwbk);
-	}
-	else if (!isSet(how_vvvvwbk))
-	{
-		var how_vvvvwbk = [];
-	}
-	var how = how_vvvvwbk.some(how_vvvvwbk_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 vvvvwbk Some function
-function how_vvvvwbk_SomeFunc(how_vvvvwbk)
-{
-	// set the function logic
-	if (how_vvvvwbk == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbl function
 function vvvvwbl(how_vvvvwbl)
 {
@@ -97,29 +59,11 @@ function vvvvwbl(how_vvvvwbl)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-		// add required attribute to php_setdocument field
-		if (jform_vvvvwblvxj_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_vvvvwblvxj_required = false;
-		}
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwblvxj_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_vvvvwblvxj_required = true;
-		}
 	}
 }
 
@@ -127,7 +71,7 @@ function vvvvwbl(how_vvvvwbl)
 function how_vvvvwbl_SomeFunc(how_vvvvwbl)
 {
 	// set the function logic
-	if (how_vvvvwbl == 3)
+	if (how_vvvvwbl == 2)
 	{
 		return true;
 	}
@@ -153,11 +97,29 @@ function vvvvwbm(how_vvvvwbm)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		// add required attribute to php_setdocument field
+		if (jform_vvvvwbmvxj_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_vvvvwbmvxj_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		// remove required attribute from php_setdocument field
+		if (!jform_vvvvwbmvxj_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_vvvvwbmvxj_required = true;
+		}
 	}
 }
 
@@ -165,7 +127,7 @@ function vvvvwbm(how_vvvvwbm)
 function how_vvvvwbm_SomeFunc(how_vvvvwbm)
 {
 	// set the function logic
-	if (how_vvvvwbm == 2 || how_vvvvwbm == 3)
+	if (how_vvvvwbm == 3)
 	{
 		return true;
 	}
@@ -191,11 +153,11 @@ function vvvvwbn(how_vvvvwbn)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -203,7 +165,7 @@ function vvvvwbn(how_vvvvwbn)
 function how_vvvvwbn_SomeFunc(how_vvvvwbn)
 {
 	// set the function logic
-	if (how_vvvvwbn == 1 || how_vvvvwbn == 2 || how_vvvvwbn == 3)
+	if (how_vvvvwbn == 2 || how_vvvvwbn == 3)
 	{
 		return true;
 	}
@@ -229,15 +191,11 @@ function vvvvwbo(how_vvvvwbo)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -245,7 +203,7 @@ function vvvvwbo(how_vvvvwbo)
 function how_vvvvwbo_SomeFunc(how_vvvvwbo)
 {
 	// set the function logic
-	if (how_vvvvwbo == 0)
+	if (how_vvvvwbo == 1 || how_vvvvwbo == 2 || how_vvvvwbo == 3)
 	{
 		return true;
 	}
@@ -271,13 +229,15 @@ function vvvvwbp(how_vvvvwbp)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -285,7 +245,7 @@ function vvvvwbp(how_vvvvwbp)
 function how_vvvvwbp_SomeFunc(how_vvvvwbp)
 {
 	// set the function logic
-	if (how_vvvvwbp == 1)
+	if (how_vvvvwbp == 0)
 	{
 		return true;
 	}
@@ -308,6 +268,46 @@ function vvvvwbq(how_vvvvwbq)
 	var how = how_vvvvwbq.some(how_vvvvwbq_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 vvvvwbq Some function
+function how_vvvvwbq_SomeFunc(how_vvvvwbq)
+{
+	// set the function logic
+	if (how_vvvvwbq == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbr function
+function vvvvwbr(how_vvvvwbr)
+{
+	if (isSet(how_vvvvwbr) && how_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = how_vvvvwbr;
+		var how_vvvvwbr = [];
+		how_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(how_vvvvwbr))
+	{
+		var how_vvvvwbr = [];
+	}
+	var how = how_vvvvwbr.some(how_vvvvwbr_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -323,45 +323,45 @@ function vvvvwbq(how_vvvvwbq)
 	}
 }
 
-// the vvvvwbq Some function
+// the vvvvwbr Some function
-function how_vvvvwbq_SomeFunc(how_vvvvwbq)
+function how_vvvvwbr_SomeFunc(how_vvvvwbr)
 {
 	// set the function logic
-	if (how_vvvvwbq == 4)
+	if (how_vvvvwbr == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbr function
+// the vvvvwbs function
-function vvvvwbr(type_vvvvwbr)
+function vvvvwbs(type_vvvvwbs)
 {
 	// set the function logic
-	if (type_vvvvwbr == 2)
+	if (type_vvvvwbs == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwbrvxk_required)
+		if (jform_vvvvwbsvxk_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwbrvxk_required = false;
+			jform_vvvvwbsvxk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwbrvxk_required)
+		if (!jform_vvvvwbsvxk_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwbrvxk_required = true;
+			jform_vvvvwbsvxk_required = true;
 		}
 	}
 }

admin/models/forms/server.js

@@ -9,180 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwcovxx_required = false;
+jform_vvvvwcpvxx_required = false;
-jform_vvvvwcovxy_required = false;
+jform_vvvvwcpvxy_required = false;
-jform_vvvvwcovxz_required = false;
+jform_vvvvwcpvxz_required = false;
-jform_vvvvwcovya_required = false;
+jform_vvvvwcpvya_required = false;
-jform_vvvvwcovyb_required = false;
+jform_vvvvwcpvyb_required = false;
-jform_vvvvwcpvyc_required = false;
+jform_vvvvwcqvyc_required = false;
-jform_vvvvwcqvyd_required = false;
+jform_vvvvwcrvyd_required = false;
-jform_vvvvwcsvye_required = false;
+jform_vvvvwctvye_required = false;
-jform_vvvvwcuvyf_required = false;
+jform_vvvvwcvvyf_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwco = jQuery("#jform_protocol").val();
-	vvvvwco(protocol_vvvvwco);
-
 	var protocol_vvvvwcp = jQuery("#jform_protocol").val();
 	vvvvwcp(protocol_vvvvwcp);
 
 	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcq = jQuery("#jform_authentication").val();
+	vvvvwcq(protocol_vvvvwcq);
-	vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq);
 
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs);
+	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
 
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
 
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+
+	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
+	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
 });
 
-// the vvvvwco function
-function vvvvwco(protocol_vvvvwco)
-{
-	if (isSet(protocol_vvvvwco) && protocol_vvvvwco.constructor !== Array)
-	{
-		var temp_vvvvwco = protocol_vvvvwco;
-		var protocol_vvvvwco = [];
-		protocol_vvvvwco.push(temp_vvvvwco);
-	}
-	else if (!isSet(protocol_vvvvwco))
-	{
-		var protocol_vvvvwco = [];
-	}
-	var protocol = protocol_vvvvwco.some(protocol_vvvvwco_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		// add required attribute to authentication field
-		if (jform_vvvvwcovxx_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwcovxx_required = false;
-		}
-		jQuery('#jform_host').closest('.control-group').show();
-		// add required attribute to host field
-		if (jform_vvvvwcovxy_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwcovxy_required = false;
-		}
-		jQuery('#jform_port').closest('.control-group').show();
-		// add required attribute to port field
-		if (jform_vvvvwcovxz_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwcovxz_required = false;
-		}
-		jQuery('#jform_path').closest('.control-group').show();
-		// add required attribute to path field
-		if (jform_vvvvwcovya_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwcovya_required = false;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		// add required attribute to username field
-		if (jform_vvvvwcovyb_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwcovyb_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		// remove required attribute from authentication field
-		if (!jform_vvvvwcovxx_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwcovxx_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		// remove required attribute from host field
-		if (!jform_vvvvwcovxy_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwcovxy_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		// remove required attribute from port field
-		if (!jform_vvvvwcovxz_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwcovxz_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		// remove required attribute from path field
-		if (!jform_vvvvwcovya_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwcovya_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		// remove required attribute from username field
-		if (!jform_vvvvwcovyb_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwcovyb_required = true;
-		}
-	}
-}
-
-// the vvvvwco Some function
-function protocol_vvvvwco_SomeFunc(protocol_vvvvwco)
-{
-	// set the function logic
-	if (protocol_vvvvwco == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwcp function
 function vvvvwcp(protocol_vvvvwcp)
 {
@@ -202,30 +64,110 @@ function vvvvwcp(protocol_vvvvwcp)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
+		// add required attribute to authentication field
-		// add required attribute to signature field
+		if (jform_vvvvwcpvxx_required)
-		if (jform_vvvvwcpvyc_required)
 		{
-			updateFieldRequired('signature',0);
+			updateFieldRequired('authentication',0);
-			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwcpvyc_required = false;
+			jform_vvvvwcpvxx_required = false;
+		}
+		jQuery('#jform_host').closest('.control-group').show();
+		// add required attribute to host field
+		if (jform_vvvvwcpvxy_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwcpvxy_required = false;
+		}
+		jQuery('#jform_port').closest('.control-group').show();
+		// add required attribute to port field
+		if (jform_vvvvwcpvxz_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwcpvxz_required = false;
+		}
+		jQuery('#jform_path').closest('.control-group').show();
+		// add required attribute to path field
+		if (jform_vvvvwcpvya_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwcpvya_required = false;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		// add required attribute to username field
+		if (jform_vvvvwcpvyb_required)
+		{
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
+			jform_vvvvwcpvyb_required = false;
 		}
 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
+		// remove required attribute from authentication field
-		// remove required attribute from signature field
+		if (!jform_vvvvwcpvxx_required)
-		if (!jform_vvvvwcpvyc_required)
 		{
-			updateFieldRequired('signature',1);
+			updateFieldRequired('authentication',1);
-			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwcpvyc_required = true;
+			jform_vvvvwcpvxx_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		// remove required attribute from host field
+		if (!jform_vvvvwcpvxy_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwcpvxy_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		// remove required attribute from port field
+		if (!jform_vvvvwcpvxz_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwcpvxz_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		// remove required attribute from path field
+		if (!jform_vvvvwcpvya_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwcpvya_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		// remove required attribute from username field
+		if (!jform_vvvvwcpvyb_required)
+		{
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
+			jform_vvvvwcpvyb_required = true;
 		}
 	}
 }
@@ -234,7 +176,7 @@ function vvvvwcp(protocol_vvvvwcp)
 function protocol_vvvvwcp_SomeFunc(protocol_vvvvwcp)
 {
 	// set the function logic
-	if (protocol_vvvvwcp == 1)
+	if (protocol_vvvvwcp == 2)
 	{
 		return true;
 	}
@@ -242,7 +184,7 @@ function protocol_vvvvwcp_SomeFunc(protocol_vvvvwcp)
 }
 
 // the vvvvwcq function
-function vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq)
+function vvvvwcq(protocol_vvvvwcq)
 {
 	if (isSet(protocol_vvvvwcq) && protocol_vvvvwcq.constructor !== Array)
 	{
@@ -256,44 +198,34 @@ function vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq)
 	}
 	var protocol = protocol_vvvvwcq.some(protocol_vvvvwcq_SomeFunc);
 
-	if (isSet(authentication_vvvvwcq) && authentication_vvvvwcq.constructor !== Array)
-	{
-		var temp_vvvvwcq = authentication_vvvvwcq;
-		var authentication_vvvvwcq = [];
-		authentication_vvvvwcq.push(temp_vvvvwcq);
-	}
-	else if (!isSet(authentication_vvvvwcq))
-	{
-		var authentication_vvvvwcq = [];
-	}
-	var authentication = authentication_vvvvwcq.some(authentication_vvvvwcq_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('.note_ftp_signature').closest('.control-group').show();
-		// add required attribute to password field
+		jQuery('#jform_signature').closest('.control-group').show();
-		if (jform_vvvvwcqvyd_required)
+		// add required attribute to signature field
+		if (jform_vvvvwcqvyc_required)
 		{
-			updateFieldRequired('password',0);
+			updateFieldRequired('signature',0);
-			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwcqvyd_required = false;
+			jform_vvvvwcqvyc_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		// remove required attribute from password field
+		jQuery('#jform_signature').closest('.control-group').hide();
-		if (!jform_vvvvwcqvyd_required)
+		// remove required attribute from signature field
+		if (!jform_vvvvwcqvyc_required)
 		{
-			updateFieldRequired('password',1);
+			updateFieldRequired('signature',1);
-			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwcqvyd_required = true;
+			jform_vvvvwcqvyc_required = true;
 		}
 	}
 }
@@ -302,50 +234,118 @@ function vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq)
 function protocol_vvvvwcq_SomeFunc(protocol_vvvvwcq)
 {
 	// set the function logic
-	if (protocol_vvvvwcq == 2)
+	if (protocol_vvvvwcq == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcq Some function
+// the vvvvwcr function
-function authentication_vvvvwcq_SomeFunc(authentication_vvvvwcq)
+function vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr)
+{
+	if (isSet(protocol_vvvvwcr) && protocol_vvvvwcr.constructor !== Array)
+	{
+		var temp_vvvvwcr = protocol_vvvvwcr;
+		var protocol_vvvvwcr = [];
+		protocol_vvvvwcr.push(temp_vvvvwcr);
+	}
+	else if (!isSet(protocol_vvvvwcr))
+	{
+		var protocol_vvvvwcr = [];
+	}
+	var protocol = protocol_vvvvwcr.some(protocol_vvvvwcr_SomeFunc);
+
+	if (isSet(authentication_vvvvwcr) && authentication_vvvvwcr.constructor !== Array)
+	{
+		var temp_vvvvwcr = authentication_vvvvwcr;
+		var authentication_vvvvwcr = [];
+		authentication_vvvvwcr.push(temp_vvvvwcr);
+	}
+	else if (!isSet(authentication_vvvvwcr))
+	{
+		var authentication_vvvvwcr = [];
+	}
+	var authentication = authentication_vvvvwcr.some(authentication_vvvvwcr_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		// add required attribute to password field
+		if (jform_vvvvwcrvyd_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwcrvyd_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		// remove required attribute from password field
+		if (!jform_vvvvwcrvyd_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwcrvyd_required = true;
+		}
+	}
+}
+
+// the vvvvwcr Some function
+function protocol_vvvvwcr_SomeFunc(protocol_vvvvwcr)
 {
 	// set the function logic
-	if (authentication_vvvvwcq == 1 || authentication_vvvvwcq == 3 || authentication_vvvvwcq == 5)
+	if (protocol_vvvvwcr == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcs function
+// the vvvvwcr Some function
-function vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs)
+function authentication_vvvvwcr_SomeFunc(authentication_vvvvwcr)
 {
-	if (isSet(protocol_vvvvwcs) && protocol_vvvvwcs.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwcr == 1 || authentication_vvvvwcr == 3 || authentication_vvvvwcr == 5)
 	{
-		var temp_vvvvwcs = protocol_vvvvwcs;
+		return true;
-		var protocol_vvvvwcs = [];
-		protocol_vvvvwcs.push(temp_vvvvwcs);
 	}
-	else if (!isSet(protocol_vvvvwcs))
+	return false;
-	{
+}
-		var protocol_vvvvwcs = [];
-	}
-	var protocol = protocol_vvvvwcs.some(protocol_vvvvwcs_SomeFunc);
 
-	if (isSet(authentication_vvvvwcs) && authentication_vvvvwcs.constructor !== Array)
+// the vvvvwct function
+function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
+{
+	if (isSet(protocol_vvvvwct) && protocol_vvvvwct.constructor !== Array)
 	{
-		var temp_vvvvwcs = authentication_vvvvwcs;
+		var temp_vvvvwct = protocol_vvvvwct;
-		var authentication_vvvvwcs = [];
+		var protocol_vvvvwct = [];
-		authentication_vvvvwcs.push(temp_vvvvwcs);
+		protocol_vvvvwct.push(temp_vvvvwct);
 	}
-	else if (!isSet(authentication_vvvvwcs))
+	else if (!isSet(protocol_vvvvwct))
 	{
-		var authentication_vvvvwcs = [];
+		var protocol_vvvvwct = [];
 	}
-	var authentication = authentication_vvvvwcs.some(authentication_vvvvwcs_SomeFunc);
+	var protocol = protocol_vvvvwct.some(protocol_vvvvwct_SomeFunc);
+
+	if (isSet(authentication_vvvvwct) && authentication_vvvvwct.constructor !== Array)
+	{
+		var temp_vvvvwct = authentication_vvvvwct;
+		var authentication_vvvvwct = [];
+		authentication_vvvvwct.push(temp_vvvvwct);
+	}
+	else if (!isSet(authentication_vvvvwct))
+	{
+		var authentication_vvvvwct = [];
+	}
+	var authentication = authentication_vvvvwct.some(authentication_vvvvwct_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwcsvye_required)
+		if (jform_vvvvwctvye_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwcsvye_required = false;
+			jform_vvvvwctvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwcsvye_required)
+		if (!jform_vvvvwctvye_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwcsvye_required = true;
+			jform_vvvvwctvye_required = true;
 		}
 	}
 }
 
-// the vvvvwcs Some function
+// the vvvvwct Some function
-function protocol_vvvvwcs_SomeFunc(protocol_vvvvwcs)
+function protocol_vvvvwct_SomeFunc(protocol_vvvvwct)
 {
 	// set the function logic
-	if (protocol_vvvvwcs == 2)
+	if (protocol_vvvvwct == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcs Some function
+// the vvvvwct Some function
-function authentication_vvvvwcs_SomeFunc(authentication_vvvvwcs)
+function authentication_vvvvwct_SomeFunc(authentication_vvvvwct)
 {
 	// set the function logic
-	if (authentication_vvvvwcs == 2 || authentication_vvvvwcs == 3)
+	if (authentication_vvvvwct == 2 || authentication_vvvvwct == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcu function
+// the vvvvwcv function
-function vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu)
+function vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv)
 {
-	if (isSet(protocol_vvvvwcu) && protocol_vvvvwcu.constructor !== Array)
+	if (isSet(protocol_vvvvwcv) && protocol_vvvvwcv.constructor !== Array)
 	{
-		var temp_vvvvwcu = protocol_vvvvwcu;
+		var temp_vvvvwcv = protocol_vvvvwcv;
-		var protocol_vvvvwcu = [];
+		var protocol_vvvvwcv = [];
-		protocol_vvvvwcu.push(temp_vvvvwcu);
+		protocol_vvvvwcv.push(temp_vvvvwcv);
 	}
-	else if (!isSet(protocol_vvvvwcu))
+	else if (!isSet(protocol_vvvvwcv))
 	{
-		var protocol_vvvvwcu = [];
+		var protocol_vvvvwcv = [];
 	}
-	var protocol = protocol_vvvvwcu.some(protocol_vvvvwcu_SomeFunc);
+	var protocol = protocol_vvvvwcv.some(protocol_vvvvwcv_SomeFunc);
 
-	if (isSet(authentication_vvvvwcu) && authentication_vvvvwcu.constructor !== Array)
+	if (isSet(authentication_vvvvwcv) && authentication_vvvvwcv.constructor !== Array)
 	{
-		var temp_vvvvwcu = authentication_vvvvwcu;
+		var temp_vvvvwcv = authentication_vvvvwcv;
-		var authentication_vvvvwcu = [];
+		var authentication_vvvvwcv = [];
-		authentication_vvvvwcu.push(temp_vvvvwcu);
+		authentication_vvvvwcv.push(temp_vvvvwcv);
 	}
-	else if (!isSet(authentication_vvvvwcu))
+	else if (!isSet(authentication_vvvvwcv))
 	{
-		var authentication_vvvvwcu = [];
+		var authentication_vvvvwcv = [];
 	}
-	var authentication = authentication_vvvvwcu.some(authentication_vvvvwcu_SomeFunc);
+	var authentication = authentication_vvvvwcv.some(authentication_vvvvwcv_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwcuvyf_required)
+		if (jform_vvvvwcvvyf_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_vvvvwcuvyf_required = false;
+			jform_vvvvwcvvyf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwcuvyf_required)
+		if (!jform_vvvvwcvvyf_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_vvvvwcuvyf_required = true;
+			jform_vvvvwcvvyf_required = true;
 		}
 	}
 }
 
-// the vvvvwcu Some function
+// the vvvvwcv Some function
-function protocol_vvvvwcu_SomeFunc(protocol_vvvvwcu)
+function protocol_vvvvwcv_SomeFunc(protocol_vvvvwcv)
 {
 	// set the function logic
-	if (protocol_vvvvwcu == 2)
+	if (protocol_vvvvwcv == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcu Some function
+// the vvvvwcv Some function
-function authentication_vvvvwcu_SomeFunc(authentication_vvvvwcu)
+function authentication_vvvvwcv_SomeFunc(authentication_vvvvwcv)
 {
 	// set the function logic
-	if (authentication_vvvvwcu == 4 || authentication_vvvvwcu == 5)
+	if (authentication_vvvvwcv == 4 || authentication_vvvvwcv == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcw function
+// the vvvvwcx function
-function vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw)
+function vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx)
 {
-	if (isSet(protocol_vvvvwcw) && protocol_vvvvwcw.constructor !== Array)
+	if (isSet(protocol_vvvvwcx) && protocol_vvvvwcx.constructor !== Array)
 	{
-		var temp_vvvvwcw = protocol_vvvvwcw;
+		var temp_vvvvwcx = protocol_vvvvwcx;
-		var protocol_vvvvwcw = [];
+		var protocol_vvvvwcx = [];
-		protocol_vvvvwcw.push(temp_vvvvwcw);
+		protocol_vvvvwcx.push(temp_vvvvwcx);
 	}
-	else if (!isSet(protocol_vvvvwcw))
+	else if (!isSet(protocol_vvvvwcx))
 	{
-		var protocol_vvvvwcw = [];
+		var protocol_vvvvwcx = [];
 	}
-	var protocol = protocol_vvvvwcw.some(protocol_vvvvwcw_SomeFunc);
+	var protocol = protocol_vvvvwcx.some(protocol_vvvvwcx_SomeFunc);
 
-	if (isSet(authentication_vvvvwcw) && authentication_vvvvwcw.constructor !== Array)
+	if (isSet(authentication_vvvvwcx) && authentication_vvvvwcx.constructor !== Array)
 	{
-		var temp_vvvvwcw = authentication_vvvvwcw;
+		var temp_vvvvwcx = authentication_vvvvwcx;
-		var authentication_vvvvwcw = [];
+		var authentication_vvvvwcx = [];
-		authentication_vvvvwcw.push(temp_vvvvwcw);
+		authentication_vvvvwcx.push(temp_vvvvwcx);
 	}
-	else if (!isSet(authentication_vvvvwcw))
+	else if (!isSet(authentication_vvvvwcx))
 	{
-		var authentication_vvvvwcw = [];
+		var authentication_vvvvwcx = [];
 	}
-	var authentication = authentication_vvvvwcw.some(authentication_vvvvwcw_SomeFunc);
+	var authentication = authentication_vvvvwcx.some(authentication_vvvvwcx_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw)
 	}
 }
 
-// the vvvvwcw Some function
+// the vvvvwcx Some function
-function protocol_vvvvwcw_SomeFunc(protocol_vvvvwcw)
+function protocol_vvvvwcx_SomeFunc(protocol_vvvvwcx)
 {
 	// set the function logic
-	if (protocol_vvvvwcw == 2)
+	if (protocol_vvvvwcx == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcw Some function
+// the vvvvwcx Some function
-function authentication_vvvvwcw_SomeFunc(authentication_vvvvwcw)
+function authentication_vvvvwcx_SomeFunc(authentication_vvvvwcx)
 {
 	// set the function logic
-	if (authentication_vvvvwcw == 2 || authentication_vvvvwcw == 3 || authentication_vvvvwcw == 4 || authentication_vvvvwcw == 5)
+	if (authentication_vvvvwcx == 2 || authentication_vvvvwcx == 3 || authentication_vvvvwcx == 4 || authentication_vvvvwcx == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.js

@@ -11,45 +11,45 @@
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzq(add_php_view_vvvvvzq);
+	vvvvvzr(add_php_view_vvvvvzr);
 
-	var add_php_jview_display_vvvvvzr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzs = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzr(add_php_jview_display_vvvvvzr);
+	vvvvvzs(add_php_jview_display_vvvvvzs);
 
-	var add_php_jview_vvvvvzs = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzs(add_php_jview_vvvvvzs);
+	vvvvvzt(add_php_jview_vvvvvzt);
 
-	var add_php_document_vvvvvzt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzt(add_php_document_vvvvvzt);
+	vvvvvzu(add_php_document_vvvvvzu);
 
-	var add_css_document_vvvvvzu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzu(add_css_document_vvvvvzu);
+	vvvvvzv(add_css_document_vvvvvzv);
 
-	var add_javascript_file_vvvvvzv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzv(add_javascript_file_vvvvvzv);
+	vvvvvzw(add_javascript_file_vvvvvzw);
 
-	var add_js_document_vvvvvzw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzw(add_js_document_vvvvvzw);
+	vvvvvzx(add_js_document_vvvvvzx);
 
-	var add_css_vvvvvzx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzx(add_css_vvvvvzx);
+	vvvvvzy(add_css_vvvvvzy);
 
-	var add_php_ajax_vvvvvzy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzy(add_php_ajax_vvvvvzy);
+	vvvvvzz(add_php_ajax_vvvvvzz);
 
-	var add_custom_button_vvvvvzz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvwaa = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzz(add_custom_button_vvvvvzz);
+	vvvvwaa(add_custom_button_vvvvwaa);
 
-	var button_position_vvvvwaa = jQuery("#jform_button_position").val();
+	var button_position_vvvvwab = jQuery("#jform_button_position").val();
-	vvvvwaa(button_position_vvvvwaa);
+	vvvvwab(button_position_vvvvwab);
 });
 
-// the vvvvvzq function
+// the vvvvvzr function
-function vvvvvzq(add_php_view_vvvvvzq)
+function vvvvvzr(add_php_view_vvvvvzr)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzq == 1)
+	if (add_php_view_vvvvvzr == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 	}
@@ -59,11 +59,11 @@ function vvvvvzq(add_php_view_vvvvvzq)
 	}
 }
 
-// the vvvvvzr function
+// the vvvvvzs function
-function vvvvvzr(add_php_jview_display_vvvvvzr)
+function vvvvvzs(add_php_jview_display_vvvvvzs)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvzr == 1)
+	if (add_php_jview_display_vvvvvzs == 1)
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 	}
@@ -73,11 +73,11 @@ function vvvvvzr(add_php_jview_display_vvvvvzr)
 	}
 }
 
-// the vvvvvzs function
+// the vvvvvzt function
-function vvvvvzs(add_php_jview_vvvvvzs)
+function vvvvvzt(add_php_jview_vvvvvzt)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvzs == 1)
+	if (add_php_jview_vvvvvzt == 1)
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 	}
@@ -87,11 +87,11 @@ function vvvvvzs(add_php_jview_vvvvvzs)
 	}
 }
 
-// the vvvvvzt function
+// the vvvvvzu function
-function vvvvvzt(add_php_document_vvvvvzt)
+function vvvvvzu(add_php_document_vvvvvzu)
 {
 	// set the function logic
-	if (add_php_document_vvvvvzt == 1)
+	if (add_php_document_vvvvvzu == 1)
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 	}
@@ -101,11 +101,11 @@ function vvvvvzt(add_php_document_vvvvvzt)
 	}
 }
 
-// the vvvvvzu function
+// the vvvvvzv function
-function vvvvvzu(add_css_document_vvvvvzu)
+function vvvvvzv(add_css_document_vvvvvzv)
 {
 	// set the function logic
-	if (add_css_document_vvvvvzu == 1)
+	if (add_css_document_vvvvvzv == 1)
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 	}
@@ -115,11 +115,11 @@ function vvvvvzu(add_css_document_vvvvvzu)
 	}
 }
 
-// the vvvvvzv function
+// the vvvvvzw function
-function vvvvvzv(add_javascript_file_vvvvvzv)
+function vvvvvzw(add_javascript_file_vvvvvzw)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvzv == 1)
+	if (add_javascript_file_vvvvvzw == 1)
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 	}
@@ -129,11 +129,11 @@ function vvvvvzv(add_javascript_file_vvvvvzv)
 	}
 }
 
-// the vvvvvzw function
+// the vvvvvzx function
-function vvvvvzw(add_js_document_vvvvvzw)
+function vvvvvzx(add_js_document_vvvvvzx)
 {
 	// set the function logic
-	if (add_js_document_vvvvvzw == 1)
+	if (add_js_document_vvvvvzx == 1)
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').show();
 	}
@@ -143,11 +143,11 @@ function vvvvvzw(add_js_document_vvvvvzw)
 	}
 }
 
-// the vvvvvzx function
+// the vvvvvzy function
-function vvvvvzx(add_css_vvvvvzx)
+function vvvvvzy(add_css_vvvvvzy)
 {
 	// set the function logic
-	if (add_css_vvvvvzx == 1)
+	if (add_css_vvvvvzy == 1)
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').show();
 	}
@@ -157,11 +157,11 @@ function vvvvvzx(add_css_vvvvvzx)
 	}
 }
 
-// the vvvvvzy function
+// the vvvvvzz function
-function vvvvvzy(add_php_ajax_vvvvvzy)
+function vvvvvzz(add_php_ajax_vvvvvzz)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvzy == 1)
+	if (add_php_ajax_vvvvvzz == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
@@ -173,11 +173,11 @@ function vvvvvzy(add_php_ajax_vvvvvzy)
 	}
 }
 
-// the vvvvvzz function
+// the vvvvwaa function
-function vvvvvzz(add_custom_button_vvvvvzz)
+function vvvvwaa(add_custom_button_vvvvwaa)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvzz == 1)
+	if (add_custom_button_vvvvwaa == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
@@ -191,20 +191,20 @@ function vvvvvzz(add_custom_button_vvvvvzz)
 	}
 }
 
-// the vvvvwaa function
+// the vvvvwab function
-function vvvvwaa(button_position_vvvvwaa)
+function vvvvwab(button_position_vvvvwab)
 {
-	if (isSet(button_position_vvvvwaa) && button_position_vvvvwaa.constructor !== Array)
+	if (isSet(button_position_vvvvwab) && button_position_vvvvwab.constructor !== Array)
 	{
-		var temp_vvvvwaa = button_position_vvvvwaa;
+		var temp_vvvvwab = button_position_vvvvwab;
-		var button_position_vvvvwaa = [];
+		var button_position_vvvvwab = [];
-		button_position_vvvvwaa.push(temp_vvvvwaa);
+		button_position_vvvvwab.push(temp_vvvvwab);
 	}
-	else if (!isSet(button_position_vvvvwaa))
+	else if (!isSet(button_position_vvvvwab))
 	{
-		var button_position_vvvvwaa = [];
+		var button_position_vvvvwab = [];
 	}
-	var button_position = button_position_vvvvwaa.some(button_position_vvvvwaa_SomeFunc);
+	var button_position = button_position_vvvvwab.some(button_position_vvvvwab_SomeFunc);
 
 
 	// set this function logic
@@ -218,11 +218,11 @@ function vvvvwaa(button_position_vvvvwaa)
 	}
 }
 
-// the vvvvwaa Some function
+// the vvvvwab Some function
-function button_position_vvvvwaa_SomeFunc(button_position_vvvvwaa)
+function button_position_vvvvwab_SomeFunc(button_position_vvvvwab)
 {
 	// set the function logic
-	if (button_position_vvvvwaa == 5)
+	if (button_position_vvvvwab == 5)
 	{
 		return true;
 	}

admin/models/forms/template.js

@@ -11,15 +11,15 @@
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvwab = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvwac = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvwab(add_php_view_vvvvwab);
+	vvvvwac(add_php_view_vvvvwac);
 });
 
-// the vvvvwab function
+// the vvvvwac function
-function vvvvwab(add_php_view_vvvvwab)
+function vvvvwac(add_php_view_vvvvwac)
 {
 	// set the function logic
-	if (add_php_view_vvvvwab == 1)
+	if (add_php_view_vvvvwac == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 	}

admin/models/joomla_plugin.php

@@ -27,8 +27,8 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 	protected $tabLayoutFields = array(
 		'code' => array(
 			'left' => array(
-				'note_beta_stage',
 				'name',
+				'description',
 				'class_extends',
 				'joomla_plugin_group',
 				'add_head',
@@ -45,7 +45,8 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				'not_required'
 			),
 			'above' => array(
-				'system_name'
+				'system_name',
+				'plugin_version'
 			)
 		),
 		'mysql' => array(
@@ -58,6 +59,8 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 		),
 		'script_file' => array(
 			'fullwidth' => array(
+				'add_php_script_construct',
+				'php_script_construct',
 				'add_php_preflight_install',
 				'php_preflight_install',
 				'add_php_preflight_update',
@@ -172,12 +175,6 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->sql_uninstall))
-			{
-				// base64 Decode sql_uninstall.
-				$item->sql_uninstall = base64_decode($item->sql_uninstall);
-			}
-
 			if (!empty($item->sql))
 			{
 				// base64 Decode sql.
@@ -202,24 +199,36 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 				$item->php_postflight_install = base64_decode($item->php_postflight_install);
 			}
 
-			if (!empty($item->readme))
-			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
-			}
-
 			if (!empty($item->head))
 			{
 				// base64 Decode head.
 				$item->head = base64_decode($item->head);
 			}
 
+			if (!empty($item->sql_uninstall))
+			{
+				// base64 Decode sql_uninstall.
+				$item->sql_uninstall = base64_decode($item->sql_uninstall);
+			}
+
+			if (!empty($item->readme))
+			{
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
+			}
+
 			if (!empty($item->main_class_code))
 			{
 				// base64 Decode main_class_code.
 				$item->main_class_code = base64_decode($item->main_class_code);
 			}
 
+			if (!empty($item->php_script_construct))
+			{
+				// base64 Decode php_script_construct.
+				$item->php_script_construct = base64_decode($item->php_script_construct);
+			}
+
 			if (!empty($item->php_preflight_install))
 			{
 				// base64 Decode php_preflight_install.
@@ -632,6 +641,28 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			return false;
 		}
 
+		// we must also delete the linked tables found
+		if (ComponentbuilderHelper::checkArray($pks))
+		{
+			// linked tables to update
+			$_tablesArray = array(
+				'joomla_plugin_updates' => 'joomla_plugin',
+				'joomla_plugin_files_folders_urls' => 'joomla_plugin'
+			);
+			foreach($_tablesArray as $_updateTable => $_key)
+			{
+				// get the linked IDs
+				if ($_pks = ComponentbuilderHelper::getVars($_updateTable, $pks, $_key, 'id'))
+				{
+					// load the model
+					$_Model = ComponentbuilderHelper::getModel($_updateTable);
+					// change publish state
+					$_Model->delete($_pks);
+				}
+			}
+		}
+
+		
 		return true;
 	}
 
@@ -652,6 +683,28 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			return false;
 		}
 
+		// we must also update all linked tables
+		if (ComponentbuilderHelper::checkArray($pks))
+		{
+			// linked tables to update
+			$_tablesArray = array(
+				'joomla_plugin_updates' => 'joomla_plugin',
+				'joomla_plugin_files_folders_urls' => 'joomla_plugin'
+			);
+			foreach($_tablesArray as $_updateTable => $_key)
+			{
+				// get the linked IDs
+				if ($_pks = ComponentbuilderHelper::getVars($_updateTable, $pks, $_key, 'id'))
+				{
+					// load the model
+					$_Model = ComponentbuilderHelper::getModel($_updateTable);
+					// change publish state
+					$_Model->publish($_pks, $value);
+				}
+			}
+		}
+
+		
 		return true;
         }
     
@@ -1072,12 +1125,6 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			$data['fields'] = '';
 		}
 
-		// Set the sql_uninstall string to base64 string.
-		if (isset($data['sql_uninstall']))
-		{
-			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
-		}
-
 		// Set the sql string to base64 string.
 		if (isset($data['sql']))
 		{
@@ -1102,24 +1149,36 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
 		}
 
-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
-		{
-			$data['readme'] = base64_encode($data['readme']);
-		}
-
 		// Set the head string to base64 string.
 		if (isset($data['head']))
 		{
 			$data['head'] = base64_encode($data['head']);
 		}
 
+		// Set the sql_uninstall string to base64 string.
+		if (isset($data['sql_uninstall']))
+		{
+			$data['sql_uninstall'] = base64_encode($data['sql_uninstall']);
+		}
+
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
+		{
+			$data['readme'] = base64_encode($data['readme']);
+		}
+
 		// Set the main_class_code string to base64 string.
 		if (isset($data['main_class_code']))
 		{
 			$data['main_class_code'] = base64_encode($data['main_class_code']);
 		}
 
+		// Set the php_script_construct string to base64 string.
+		if (isset($data['php_script_construct']))
+		{
+			$data['php_script_construct'] = base64_encode($data['php_script_construct']);
+		}
+
 		// Set the php_preflight_install string to base64 string.
 		if (isset($data['php_preflight_install']))
 		{

admin/models/joomla_plugin_updates.php

@@ -0,0 +1,880 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\Registry\Registry;
+
+/**
+ * Componentbuilder Joomla_plugin_updates Model
+ */
+class ComponentbuilderModelJoomla_plugin_updates extends JModelAdmin
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'updates' => array(
+			'fullwidth' => array(
+				'version_update'
+			),
+			'above' => array(
+				'joomla_plugin'
+			)
+		)
+	);
+
+	/**
+	 * @var        string    The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_COMPONENTBUILDER';
+
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var      string
+	 * @since    3.2
+	 */
+	public $typeAlias = 'com_componentbuilder.joomla_plugin_updates';
+
+	/**
+	 * Returns a Table object, always creating it
+	 *
+	 * @param   type    $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'joomla_plugin_updates', $prefix = 'ComponentbuilderTable', $config = array())
+	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
+		return JTable::getInstance($type, $prefix, $config);
+	}
+    
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			if (!empty($item->params) && !is_array($item->params))
+			{
+				// Convert the params field to an array.
+				$registry = new Registry;
+				$registry->loadString($item->params);
+				$item->params = $registry->toArray();
+			}
+
+			if (!empty($item->metadata))
+			{
+				// Convert the metadata field to an array.
+				$registry = new Registry;
+				$registry->loadString($item->metadata);
+				$item->metadata = $registry->toArray();
+			}
+
+			if (!empty($item->version_update))
+			{
+				// Convert the version_update field to an array.
+				$version_update = new Registry;
+				$version_update->loadString($item->version_update);
+				$item->version_update = $version_update->toArray();
+			}
+			
+			if (!empty($item->id))
+			{
+				$item->tags = new JHelperTags;
+				$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_plugin_updates');
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
+		// Get the form.
+		$form = $this->loadForm('com_componentbuilder.joomla_plugin_updates', 'joomla_plugin_updates', $options);
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$jinput = JFactory::getApplication()->input;
+
+		// The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		if ($jinput->get('a_id'))
+		{
+			$id = $jinput->get('a_id', 0, 'INT');
+		}
+		// The back end uses id so we use that the rest of the time and set it to 0 by default.
+		else
+		{
+			$id = $jinput->get('id', 0, 'INT');
+		}
+
+		$user = JFactory::getUser();
+
+		// Check for existing item.
+		// Modify the form based on Edit State access controls.
+		if ($id != 0 && (!$user->authorise('joomla_plugin_updates.edit.state', 'com_componentbuilder.joomla_plugin_updates.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('joomla_plugin_updates.edit.state', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+			// Disable fields while saving.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+		// If this is a new item insure the greated by is set.
+		if (0 == $id)
+		{
+			// Set the created_by to this user
+			$form->setValue('created_by', null, $user->id);
+		}
+		// Modify the form based on Edit Creaded By access controls.
+		if ($id != 0 && (!$user->authorise('joomla_plugin_updates.edit.created_by', 'com_componentbuilder.joomla_plugin_updates.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('joomla_plugin_updates.edit.created_by', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('created_by', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('created_by', 'readonly', 'true');
+			// Disable fields while saving.
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+		// Modify the form based on Edit Creaded Date access controls.
+		if ($id != 0 && (!$user->authorise('joomla_plugin_updates.edit.created', 'com_componentbuilder.joomla_plugin_updates.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('joomla_plugin_updates.edit.created', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('created', 'disabled', 'true');
+			// Disable fields while saving.
+			$form->setFieldAttribute('created', 'filter', 'unset');
+		}
+		// Only load these values if no id is found
+		if (0 == $id)
+		{
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
+			if (0 != $redirectedValue && $redirectedField)
+			{
+				// Now set the local-redirected field default value
+				$form->setValue($redirectedField, null, $redirectedValue);
+			}
+		}
+		return $form;
+	}
+
+	/**
+	 * Method to get the script that have to be included on the form
+	 *
+	 * @return string	script files
+	 */
+	public function getScript()
+	{
+		return 'administrator/components/com_componentbuilder/models/forms/joomla_plugin_updates.js';
+	}
+    
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->published != -2)
+			{
+				return;
+			}
+
+			$user = JFactory::getUser();
+			// The record has been set. Check the record permissions.
+			return $user->authorise('joomla_plugin_updates.delete', 'com_componentbuilder.joomla_plugin_updates.' . (int) $record->id);
+		}
+		return false;
+	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+		$recordId = (!empty($record->id)) ? $record->id : 0;
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('joomla_plugin_updates.edit.state', 'com_componentbuilder.joomla_plugin_updates.' . (int) $recordId);
+			if (!$permission && !is_null($permission))
+			{
+				return false;
+			}
+		}
+		// In the absense of better information, revert to the component permissions.
+		return $user->authorise('joomla_plugin_updates.edit.state', 'com_componentbuilder');
+	}
+    
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param	array	$data	An array of input data.
+	 * @param	string	$key	The name of the key for the primary key.
+	 *
+	 * @return	boolean
+	 * @since	2.5
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Check specific edit permission then general edit permission.
+		$user = JFactory::getUser();
+
+		return $user->authorise('joomla_plugin_updates.edit', 'com_componentbuilder.joomla_plugin_updates.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('joomla_plugin_updates.edit',  'com_componentbuilder');
+	}
+    
+	/**
+	 * Prepare and sanitise the table data prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+		
+		if (isset($table->name))
+		{
+			$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+		}
+		
+		if (isset($table->alias) && empty($table->alias))
+		{
+			$table->generateAlias();
+		}
+		
+		if (empty($table->id))
+		{
+			$table->created = $date->toSql();
+			// set the user
+			if ($table->created_by == 0 || empty($table->created_by))
+			{
+				$table->created_by = $user->id;
+			}
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__componentbuilder_joomla_plugin_updates'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			$table->modified = $date->toSql();
+			$table->modified_by = $user->id;
+		}
+        
+		if (!empty($table->id))
+		{
+			// Increment the items version number.
+			$table->version++;
+		}
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData() 
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_componentbuilder.edit.joomla_plugin_updates.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to get the unique fields of this table.
+	 *
+	 * @return  mixed  An array of field names, boolean false if none is set.
+	 *
+	 * @since   3.0
+	 */
+	protected function getUniqeFields()
+	{
+		return false;
+	}
+	
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  &$pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   12.2
+	 */
+	public function delete(&$pks)
+	{
+		if (!parent::delete($pks))
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.2
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		if (!parent::publish($pks, $value))
+		{
+			return false;
+		}
+		
+		return true;
+        }
+    
+	/**
+	 * Method to perform batch operations on an item or a set of items.
+	 *
+	 * @param   array  $commands  An array of commands to perform.
+	 * @param   array  $pks       An array of item ids.
+	 * @param   array  $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   12.2
+	 */
+	public function batch($commands, $pks, $contexts)
+	{
+		// Sanitize ids.
+		$pks = array_unique($pks);
+		JArrayHelper::toInteger($pks);
+
+		// Remove any values of zero.
+		if (array_search(0, $pks, true))
+		{
+			unset($pks[array_search(0, $pks, true)]);
+		}
+
+		if (empty($pks))
+		{
+			$this->setError(JText::_('JGLOBAL_NO_ITEM_SELECTED'));
+			return false;
+		}
+
+		$done = false;
+
+		// Set some needed variables.
+		$this->user			= JFactory::getUser();
+		$this->table			= $this->getTable();
+		$this->tableClassName		= get_class($this->table);
+		$this->contentType		= new JUcmType;
+		$this->type			= $this->contentType->getTypeByTable($this->tableClassName);
+		$this->canDo			= ComponentbuilderHelper::getActions('joomla_plugin_updates');
+		$this->batchSet			= true;
+
+		if (!$this->canDo->get('core.batch'))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+			return false;
+		}
+        
+		if ($this->type == false)
+		{
+			$type = new JUcmType;
+			$this->type = $type->getTypeByAlias($this->typeAlias);
+		}
+
+		$this->tagsObserver = $this->table->getObserverOfClass('JTableObserverTags');
+
+		if (!empty($commands['move_copy']))
+		{
+			$cmd = JArrayHelper::getValue($commands, 'move_copy', 'c');
+
+			if ($cmd == 'c')
+			{
+				$result = $this->batchCopy($commands, $pks, $contexts);
+
+				if (is_array($result))
+				{
+					foreach ($result as $old => $new)
+					{
+						$contexts[$new] = $contexts[$old];
+					}
+					$pks = array_values($result);
+				}
+				else
+				{
+					return false;
+				}
+			}
+			elseif ($cmd == 'm' && !$this->batchMove($commands, $pks, $contexts))
+			{
+				return false;
+			}
+
+			$done = true;
+		}
+
+		if (!$done)
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $values    The new values.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since 12.2
+	 */
+	protected function batchCopy($values, $pks, $contexts)
+	{
+		if (empty($this->batchSet))
+		{
+			// Set some needed variables.
+			$this->user 		= JFactory::getUser();
+			$this->table 		= $this->getTable();
+			$this->tableClassName	= get_class($this->table);
+			$this->canDo		= ComponentbuilderHelper::getActions('joomla_plugin_updates');
+		}
+
+		if (!$this->canDo->get('joomla_plugin_updates.create') && !$this->canDo->get('joomla_plugin_updates.batch'))
+		{
+			return false;
+		}
+
+		// get list of uniqe fields
+		$uniqeFields = $this->getUniqeFields();
+		// remove move_copy from array
+		unset($values['move_copy']);
+
+		// make sure published is set
+		if (!isset($values['published']))
+		{
+			$values['published'] = 0;
+		}
+		elseif (isset($values['published']) && !$this->canDo->get('joomla_plugin_updates.edit.state'))
+		{
+				$values['published'] = 0;
+		}
+
+		$newIds = array();
+		// Parent exists so let's proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// only allow copy if user may edit this item.
+			if (!$this->user->authorise('joomla_plugin_updates.edit', $contexts[$pk]))
+			{
+				// Not fatal error
+				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+				continue;
+			}
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Only for strings
+			if (ComponentbuilderHelper::checkString($this->table->joomla_plugin) && !is_numeric($this->table->joomla_plugin))
+			{
+				$this->table->joomla_plugin = $this->generateUniqe('joomla_plugin',$this->table->joomla_plugin);
+			}
+
+			// insert all set values
+			if (ComponentbuilderHelper::checkArray($values))
+			{
+				foreach ($values as $key => $value)
+				{
+					if (strlen($value) > 0 && isset($this->table->$key))
+					{
+						$this->table->$key = $value;
+					}
+				}
+			}
+
+			// update all uniqe fields
+			if (ComponentbuilderHelper::checkArray($uniqeFields))
+			{
+				foreach ($uniqeFields as $uniqeField)
+				{
+					$this->table->$uniqeField = $this->generateUniqe($uniqeField,$this->table->$uniqeField);
+				}
+			}
+
+			// Reset the ID because we are making a copy
+			$this->table->id = 0;
+
+			// TODO: Deal with ordering?
+			// $this->table->ordering = 1;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			if (!empty($this->type))
+			{
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+			}
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move items to a new category
+	 *
+	 * @param   integer  $value     The new category ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since 12.2
+	 */
+	protected function batchMove($values, $pks, $contexts)
+	{
+		if (empty($this->batchSet))
+		{
+			// Set some needed variables.
+			$this->user		= JFactory::getUser();
+			$this->table		= $this->getTable();
+			$this->tableClassName	= get_class($this->table);
+			$this->canDo		= ComponentbuilderHelper::getActions('joomla_plugin_updates');
+		}
+
+		if (!$this->canDo->get('joomla_plugin_updates.edit') && !$this->canDo->get('joomla_plugin_updates.batch'))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+			return false;
+		}
+
+		// make sure published only updates if user has the permission.
+		if (isset($values['published']) && !$this->canDo->get('joomla_plugin_updates.edit.state'))
+		{
+			unset($values['published']);
+		}
+		// remove move_copy from array
+		unset($values['move_copy']);
+
+		// Parent exists so we proceed
+		foreach ($pks as $pk)
+		{
+			if (!$this->user->authorise('joomla_plugin_updates.edit', $contexts[$pk]))
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+				return false;
+			}
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// insert all set values.
+			if (ComponentbuilderHelper::checkArray($values))
+			{
+				foreach ($values as $key => $value)
+				{
+					// Do special action for access.
+					if ('access' === $key && strlen($value) > 0)
+					{
+						$this->table->$key = $value;
+					}
+					elseif (strlen($value) > 0 && isset($this->table->$key))
+					{
+						$this->table->$key = $value;
+					}
+				}
+			}
+
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			if (!empty($this->type))
+			{
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+			}
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+	
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$input	= JFactory::getApplication()->input;
+		$filter	= JFilterInput::getInstance();
+        
+		// set the metadata to the Item Data
+		if (isset($data['metadata']) && isset($data['metadata']['author']))
+		{
+			$data['metadata']['author'] = $filter->clean($data['metadata']['author'], 'TRIM');
+            
+			$metadata = new JRegistry;
+			$metadata->loadArray($data['metadata']);
+			$data['metadata'] = (string) $metadata;
+		}
+
+		// Set the version_update items to data.
+		if (isset($data['version_update']) && is_array($data['version_update']))
+		{
+			$version_update = new JRegistry;
+			$version_update->loadArray($data['version_update']);
+			$data['version_update'] = (string) $version_update;
+		}
+		elseif (!isset($data['version_update']))
+		{
+			// Set the empty version_update to data
+			$data['version_update'] = '';
+		}
+        
+		// Set the Params Items to data
+		if (isset($data['params']) && is_array($data['params']))
+		{
+			$params = new JRegistry;
+			$params->loadArray($data['params']);
+			$data['params'] = (string) $params;
+		}
+
+		// Alter the uniqe field for save as copy
+		if ($input->get('task') === 'save2copy')
+		{
+			// Automatic handling of other uniqe fields
+			$uniqeFields = $this->getUniqeFields();
+			if (ComponentbuilderHelper::checkArray($uniqeFields))
+			{
+				foreach ($uniqeFields as $uniqeField)
+				{
+					$data[$uniqeField] = $this->generateUniqe($uniqeField,$data[$uniqeField]);
+				}
+			}
+		}
+		
+		if (parent::save($data))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Method to generate a uniqe value.
+	 *
+	 * @param   string  $field name.
+	 * @param   string  $value data.
+	 *
+	 * @return  string  New value.
+	 *
+	 * @since   3.0
+	 */
+	protected function generateUniqe($field,$value)
+	{
+
+		// set field value uniqe 
+		$table = $this->getTable();
+
+		while ($table->load(array($field => $value)))
+		{
+			$value = JString::increment($value);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Method to change the title
+	 *
+	 * @param   string   $title   The title.
+	 *
+	 * @return	array  Contains the modified title and alias.
+	 *
+	 */
+	protected function _generateNewTitle($title)
+	{
+
+		// Alter the title
+		$table = $this->getTable();
+
+		while ($table->load(array('title' => $title)))
+		{
+			$title = JString::increment($title);
+		}
+
+		return $title;
+	}
+}

admin/models/joomla_plugins.php

@@ -363,7 +363,7 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.class_extends LIKE '.$search.' OR g.name LIKE '.$search.' OR a.joomla_plugin_group LIKE '.$search.' OR h.name LIKE '.$search.' OR a.name LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.class_extends LIKE '.$search.' OR g.name LIKE '.$search.' OR a.joomla_plugin_group LIKE '.$search.' OR h.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.name LIKE '.$search.')');
 			}
 		}
 

admin/models/joomla_plugins_updates.php

@@ -0,0 +1,237 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Joomla_plugins_updates Model
+ */
+class ComponentbuilderModelJoomla_plugins_updates extends JModelList
+{
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+        {
+			$config['filter_fields'] = array(
+				'a.id','id',
+				'a.published','published',
+				'a.ordering','ordering',
+				'a.created_by','created_by',
+				'a.modified_by','modified_by'
+			);
+		}
+
+		parent::__construct($config);
+	}
+	
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @return  void
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+		
+        
+		$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+		$this->setState('filter.sorting', $sorting);
+        
+		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+		$this->setState('filter.access', $access);
+        
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+		$this->setState('filter.published', $published);
+        
+		$created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+		$this->setState('filter.created_by', $created_by);
+
+		$created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+		$this->setState('filter.created', $created);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+	
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// check in items
+		$this->checkInNow();
+
+		// load parent items
+		$items = parent::getItems();
+
+		// set values to display correctly.
+		if (ComponentbuilderHelper::checkArray($items))
+		{
+			foreach ($items as $nr => &$item)
+			{
+				$access = (JFactory::getUser()->authorise('joomla_plugin_updates.access', 'com_componentbuilder.joomla_plugin_updates.' . (int) $item->id) && JFactory::getUser()->authorise('joomla_plugin_updates.access', 'com_componentbuilder'));
+				if (!$access)
+				{
+					unset($items[$nr]);
+					continue;
+				}
+
+			}
+		}
+        
+		// return items
+		return $items;
+	}
+	
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return	string	An SQL query
+	 */
+	protected function getListQuery()
+	{
+		// Get the user object.
+		$user = JFactory::getUser();
+		// Create a new query object.
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+
+		// Select some fields
+		$query->select('a.*');
+
+		// From the componentbuilder_item table
+		$query->from($db->quoteName('#__componentbuilder_joomla_plugin_updates', 'a'));
+
+		// From the componentbuilder_joomla_plugin table.
+		$query->select($db->quoteName('g.system_name','joomla_plugin_system_name'));
+		$query->join('LEFT', $db->quoteName('#__componentbuilder_joomla_plugin', 'g') . ' ON (' . $db->quoteName('a.joomla_plugin') . ' = ' . $db->quoteName('g.id') . ')');
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.published = 0 OR a.published = 1)');
+		}
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level');
+		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+		// Implement View Level Access
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Add the list ordering clause.
+		$orderCol = $this->state->get('list.ordering', 'a.id');
+		$orderDirn = $this->state->get('list.direction', 'asc');	
+		if ($orderCol != '')
+		{
+			$query->order($db->escape($orderCol . ' ' . $orderDirn));
+		}
+
+		return $query;
+	}
+	
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * @return  string  A store id.
+	 *
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.id');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.ordering');
+		$id .= ':' . $this->getState('filter.created_by');
+		$id .= ':' . $this->getState('filter.modified_by');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to checkin all items left checked out longer then a set time.
+	 *
+	 * @return  a bool
+	 *
+	 */
+	protected function checkInNow()
+	{
+		// Get set check in time
+		$time = JComponentHelper::getParams('com_componentbuilder')->get('check_in');
+
+		if ($time)
+		{
+
+			// Get a db connection.
+			$db = JFactory::getDbo();
+			// reset query
+			$query = $db->getQuery(true);
+			$query->select('*');
+			$query->from($db->quoteName('#__componentbuilder_joomla_plugin_updates'));
+			$db->setQuery($query);
+			$db->execute();
+			if ($db->getNumRows())
+			{
+				// Get Yesterdays date
+				$date = JFactory::getDate()->modify($time)->toSql();
+				// reset query
+				$query = $db->getQuery(true);
+
+				// Fields to update.
+				$fields = array(
+					$db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'',
+					$db->quoteName('checked_out') . '=0'
+				);
+
+				// Conditions for which records should be updated.
+				$conditions = array(
+					$db->quoteName('checked_out') . '!=0', 
+					$db->quoteName('checked_out_time') . '<\''.$date.'\''
+				);
+
+				// Check table
+				$query->update($db->quoteName('#__componentbuilder_joomla_plugin_updates'))->set($fields)->where($conditions); 
+
+				$db->setQuery($query);
+
+				$db->execute();
+			}
+		}
+
+		return false;
+	}
+}

admin/sql/install.mysql.utf8.sql

@@ -151,12 +151,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
 	`add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_preflight_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_script_construct` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_sales_server` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_update_server` TINYINT(1) NOT NULL DEFAULT 0,
 	`addreadme` TINYINT(1) NOT NULL DEFAULT 0,
 	`class_extends` INT(11) NOT NULL DEFAULT 0,
+	`description` TEXT NOT NULL,
 	`fields` TEXT NOT NULL,
 	`head` TEXT NOT NULL,
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
@@ -169,6 +171,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
 	`php_preflight_install` MEDIUMTEXT NOT NULL,
 	`php_preflight_uninstall` MEDIUMTEXT NOT NULL,
 	`php_preflight_update` MEDIUMTEXT NOT NULL,
+	`php_script_construct` MEDIUMTEXT NOT NULL,
+	`plugin_version` CHAR(64) NOT NULL DEFAULT '',
 	`property_selection` TEXT NOT NULL,
 	`readme` TEXT NOT NULL,
 	`sales_server` INT(11) NOT NULL DEFAULT 0,
@@ -200,18 +204,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
 	KEY `idx_class_extends` (`class_extends`),
 	KEY `idx_joomla_plugin_group` (`joomla_plugin_group`),
 	KEY `idx_add_sales_server` (`add_sales_server`),
-	KEY `idx_name` (`name`),
+	KEY `idx_add_php_postflight_install` (`add_php_postflight_install`),
 	KEY `idx_add_php_postflight_update` (`add_php_postflight_update`),
 	KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`),
+	KEY `idx_add_php_script_construct` (`add_php_script_construct`),
 	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
 	KEY `idx_add_sql_uninstall` (`add_sql_uninstall`),
+	KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
 	KEY `idx_addreadme` (`addreadme`),
-	KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
 	KEY `idx_add_update_server` (`add_update_server`),
+	KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
 	KEY `idx_update_server_target` (`update_server_target`),
 	KEY `idx_add_php_preflight_uninstall` (`add_php_preflight_uninstall`),
-	KEY `idx_add_php_postflight_install` (`add_php_postflight_install`)
+	KEY `idx_name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
@@ -1651,6 +1656,32 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` (
 	KEY `idx_class_extends` (`class_extends`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
+	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
+	`version_update` TEXT NOT NULL,
+	`params` text NOT NULL,
+	`published` TINYINT(3) NOT NULL DEFAULT 1,
+	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
+	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
+	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
+	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`version` INT(10) unsigned NOT NULL DEFAULT 1,
+	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
+	`access` INT(10) unsigned NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	PRIMARY KEY  (`id`),
+	KEY `idx_access` (`access`),
+	KEY `idx_checkout` (`checked_out`),
+	KEY `idx_createdby` (`created_by`),
+	KEY `idx_modifiedby` (`modified_by`),
+	KEY `idx_state` (`published`),
+	KEY `idx_joomla_plugin` (`joomla_plugin`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
+
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',

admin/sql/uninstall.mysql.utf8.sql

@@ -39,5 +39,6 @@ DROP TABLE IF EXISTS `#__componentbuilder_library_config`;
 DROP TABLE IF EXISTS `#__componentbuilder_library_files_folders_urls`;
 DROP TABLE IF EXISTS `#__componentbuilder_class_extends`;
 DROP TABLE IF EXISTS `#__componentbuilder_joomla_plugin_group`;
+DROP TABLE IF EXISTS `#__componentbuilder_joomla_plugin_updates`;
 DROP TABLE IF EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls`;
 DROP TABLE IF EXISTS `#__componentbuilder_external_code`;

admin/sql/updates/mysql/2.9.35.sql

@@ -0,0 +1,33 @@
+ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `add_php_script_construct` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_preflight_update`;
+
+ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `description` TEXT NOT NULL AFTER `class_extends`;
+
+ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `php_script_construct` MEDIUMTEXT NOT NULL AFTER `php_preflight_update`;
+
+ALTER TABLE `#__componentbuilder_joomla_plugin` ADD `plugin_version` CHAR(64) NOT NULL DEFAULT '' AFTER `php_script_construct`;
+
+CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
+	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
+	`version_update` TEXT NOT NULL,
+	`params` text NOT NULL,
+	`published` TINYINT(3) NOT NULL DEFAULT 1,
+	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
+	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
+	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`checked_out` int(11) unsigned NOT NULL DEFAULT 0,
+	`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+	`version` INT(10) unsigned NOT NULL DEFAULT 1,
+	`hits` INT(10) unsigned NOT NULL DEFAULT 0,
+	`access` INT(10) unsigned NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	PRIMARY KEY  (`id`),
+	KEY `idx_access` (`access`),
+	KEY `idx_checkout` (`checked_out`),
+	KEY `idx_createdby` (`created_by`),
+	KEY `idx_modifiedby` (`modified_by`),
+	KEY `idx_state` (`published`),
+	KEY `idx_joomla_plugin` (`joomla_plugin`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;

admin/tables/joomla_plugin_updates.php

@@ -0,0 +1,321 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla_plugins_updates Table class
+ */
+class ComponentbuilderTableJoomla_plugin_updates extends JTable
+{
+	/**
+	 * Ensure the params and metadata in json encoded in the bind method
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $_jsonEncode = array('params', 'metadata');
+    
+	/**
+	 * Constructor
+	 *
+	 * @param object Database connector object
+	 */
+	function __construct(&$db) 
+	{
+		parent::__construct('#__componentbuilder_joomla_plugin_updates', 'id', $db);
+
+		// Adding History Options
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.joomla_plugin_updates'));
+	}	
+ 
+	public function bind($array, $ignore = '')
+	{
+    
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new JRegistry;
+			$registry->loadArray($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['metadata']) && is_array($array['metadata']))
+		{
+			$registry = new JRegistry;
+			$registry->loadArray($array['metadata']);
+			$array['metadata'] = (string) $registry;
+		}
+        
+		// Bind the rules. 
+		if (isset($array['rules']) && is_array($array['rules']))
+		{ 
+			$rules = new JAccessRules($array['rules']); 
+			$this->setRules($rules); 
+		}
+		return parent::bind($array, $ignore);
+	}
+    
+	/**
+	 * Overload the store method for the Joomla_plugin_updates table.
+	 *
+	 * @param   boolean	Toggle whether null values should be updated.
+	 * @return  boolean  True on success, false on failure.
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$date	= JFactory::getDate();
+		$user	= JFactory::getUser();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified		= $date->toSql();
+			$this->modified_by	= $user->get('id');
+		}
+		else
+		{
+			// New joomla_plugin_updates. A joomla_plugin_updates created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date->toSql();
+			}
+			if (empty($this->created_by))
+			{
+				$this->created_by = $user->get('id');
+			}
+		}
+		
+		if (isset($this->alias))
+		{
+			// Verify that the alias is unique
+			$table = JTable::getInstance('joomla_plugin_updates', 'ComponentbuilderTable');
+
+			if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
+			{
+				$this->setError(JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ERROR_UNIQUE_ALIAS'));
+				return false;
+			}
+		}
+		
+		if (isset($this->url))
+		{
+			// Convert IDN urls to punycode
+			$this->url = JStringPunycode::urlToPunycode($this->url);
+		}
+		if (isset($this->website))
+		{
+			// Convert IDN urls to punycode
+			$this->website = JStringPunycode::urlToPunycode($this->website);
+		}
+
+		return parent::store($updateNulls);
+	}
+    
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function check()
+	{
+		if (isset($this->alias))
+		{
+			// Generate a valid alias
+			$this->generateAlias();
+            
+			$table = JTable::getInstance('joomla_plugin_updates', 'componentbuilderTable');
+
+			while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
+			{
+				$this->alias = JString::increment($this->alias, 'dash');
+			}
+		}
+		
+		/*
+		 * Clean up keywords -- eliminate extra spaces between phrases
+		 * and cr (\r) and lf (\n) characters from string.
+		 * Only process if not empty.
+ 		 */
+		if (!empty($this->metakey))
+		{
+			// Array of characters to remove.
+			$bad_characters = array("\n", "\r", "\"", "<", ">");
+
+			// Remove bad characters.
+			$after_clean = JString::str_ireplace($bad_characters, "", $this->metakey);
+
+			// Create array using commas as delimiter.
+			$keys = explode(',', $after_clean);
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				// Ignore blank keywords.
+				if (trim($key))
+				{
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(", ", $clean_keys);
+		}
+
+		// Clean up description -- eliminate quotes and <> brackets
+		if (!empty($this->metadesc))
+		{
+			// Only process if not empty
+			$bad_characters = array("\"", "<", ">");
+			$this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc);
+		}
+
+		// If we don't have any access rules set at this point just use an empty JAccessRules class
+		if (!$this->getRules())
+		{
+			$rules = $this->getDefaultAssetValues('com_componentbuilder.joomla_plugin_updates.'.$this->id);
+			$this->setRules($rules);
+		}
+        
+		// Set ordering
+		if ($this->published < 0)
+		{
+			// Set ordering to 0 if state is archived or trashed
+			$this->ordering = 0;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the default asset values for a component.
+	 *
+	 * @param   $string  $component  The component asset name to search for
+	 *
+	 * @return  JAccessRules  The JAccessRules object for the asset
+	 */
+	protected function getDefaultAssetValues($component, $try = true)
+	{
+		// Need to find the asset id by the name of the component.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__assets'))
+			->where($db->quoteName('name') . ' = ' . $db->quote($component));
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->loadRowList())
+		{
+			// asset alread set so use saved rules
+			$assetId = (int) $db->loadResult();
+			return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
+		}
+		// try again
+		elseif ($try)
+		{
+			$try = explode('.',$component);
+			$result =  $this->getDefaultAssetValues($try[0], false);
+			if ($result instanceof JAccessRules)
+			{
+				if (isset($try[1]))
+				{
+					$_result = (string) $result;
+					$_result = json_decode($_result);
+					foreach ($_result as $name => &$rule)
+					{
+						$v = explode('.', $name);
+						if ($try[1] !== $v[0])
+						{
+							// remove since it is not part of this view
+							unset($_result->$name);
+						}
+						else
+						{
+							// clear the value since we inherit
+							$rule = array();
+						}
+					}
+					// check if there are any view values remaining
+					if (count( (array) $_result))
+					{
+						$_result = json_encode($_result);
+						$_result = array($_result);
+						// Instantiate and return the JAccessRules object for the asset rules.
+						$rules = new JAccessRules;
+						$rules->mergeCollection($_result);
+
+						return $rules;
+					}
+				}
+				return $result;
+			}
+		}
+		return JAccess::getAssetRules(0);
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form 'table_name.id'
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return	string
+	 * @since	2.5
+	 */
+	protected function _getAssetName()
+	{
+		$k = $this->_tbl_key;
+		return 'com_componentbuilder.joomla_plugin_updates.'.(int) $this->$k;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return	string
+	 * @since	2.5
+	 */
+	protected function _getAssetTitle()
+	{
+		if (isset($this->title))
+		{
+			return $this->title;
+		}
+		return '';
+	}
+
+	/**
+	 * Get the parent asset id for the record
+	 *
+	 * @return	int
+	 * @since	2.5
+	 */
+	protected function _getAssetParentId(JTable $table = NULL, $id = NULL) 
+	{
+		$asset = JTable::getInstance('Asset');
+		$asset->loadByName('com_componentbuilder');
+
+		return $asset->id;
+	}
+
+	/**
+	 * This view does not actually have an alias
+	 *
+	 * @return  bool
+	 */
+	public function generateAlias()
+	{
+		return false;
+	}
+
+}

admin/views/admin_view/tmpl/edit.php

@@ -208,491 +208,476 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_css_view listeners for add_css_view_vvvvvxy function
+// #jform_add_css_view listeners for add_css_view_vvvvvxz function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvvxy = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvvxz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvxy(add_css_view_vvvvvxy);
+	vvvvvxz(add_css_view_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvvxy = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvvxz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvxy(add_css_view_vvvvvxy);
+	vvvvvxz(add_css_view_vvvvvxz);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvvxz function
+// #jform_add_css_views listeners for add_css_views_vvvvvya function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvvxz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvvya = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvxz(add_css_views_vvvvvxz);
+	vvvvvya(add_css_views_vvvvvya);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvvxz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvvya = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvxz(add_css_views_vvvvvxz);
+	vvvvvya(add_css_views_vvvvvya);
 
 });
 
-// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvya function
+// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvyb function
 jQuery('#jform_add_javascript_view_file').on('keyup',function()
 {
-	var add_javascript_view_file_vvvvvya = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	var add_javascript_view_file_vvvvvyb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvya(add_javascript_view_file_vvvvvya);
+	vvvvvyb(add_javascript_view_file_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_file_vvvvvya = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	var add_javascript_view_file_vvvvvyb = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvya(add_javascript_view_file_vvvvvya);
+	vvvvvyb(add_javascript_view_file_vvvvvyb);
 
 });
 
-// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvyb function
+// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvyc function
 jQuery('#jform_add_javascript_views_file').on('keyup',function()
 {
-	var add_javascript_views_file_vvvvvyb = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	var add_javascript_views_file_vvvvvyc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvyb(add_javascript_views_file_vvvvvyb);
+	vvvvvyc(add_javascript_views_file_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_file_vvvvvyb = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	var add_javascript_views_file_vvvvvyc = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvyb(add_javascript_views_file_vvvvvyb);
+	vvvvvyc(add_javascript_views_file_vvvvvyc);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvyc function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvyd function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvvyc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvvyd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvyc(add_javascript_view_footer_vvvvvyc);
+	vvvvvyd(add_javascript_view_footer_vvvvvyd);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvvyc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvvyd = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvyc(add_javascript_view_footer_vvvvvyc);
+	vvvvvyd(add_javascript_view_footer_vvvvvyd);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvyd function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvye function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvvyd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvvye = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvyd(add_javascript_views_footer_vvvvvyd);
+	vvvvvye(add_javascript_views_footer_vvvvvye);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvvyd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvvye = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvyd(add_javascript_views_footer_vvvvvyd);
+	vvvvvye(add_javascript_views_footer_vvvvvye);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvye function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyf function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvye = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvye(add_php_ajax_vvvvvye);
+	vvvvvyf(add_php_ajax_vvvvvyf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvye = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyf = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvye(add_php_ajax_vvvvvye);
+	vvvvvyf(add_php_ajax_vvvvvyf);
 
 });
 
-// #jform_add_php_getitem listeners for add_php_getitem_vvvvvyf function
+// #jform_add_php_getitem listeners for add_php_getitem_vvvvvyg function
 jQuery('#jform_add_php_getitem').on('keyup',function()
 {
-	var add_php_getitem_vvvvvyf = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	var add_php_getitem_vvvvvyg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvyf(add_php_getitem_vvvvvyf);
+	vvvvvyg(add_php_getitem_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_getitem_vvvvvyf = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	var add_php_getitem_vvvvvyg = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvyf(add_php_getitem_vvvvvyf);
+	vvvvvyg(add_php_getitem_vvvvvyg);
 
 });
 
-// #jform_add_php_getitems listeners for add_php_getitems_vvvvvyg function
+// #jform_add_php_getitems listeners for add_php_getitems_vvvvvyh function
 jQuery('#jform_add_php_getitems').on('keyup',function()
 {
-	var add_php_getitems_vvvvvyg = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	var add_php_getitems_vvvvvyh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvyg(add_php_getitems_vvvvvyg);
+	vvvvvyh(add_php_getitems_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_vvvvvyg = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	var add_php_getitems_vvvvvyh = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvyg(add_php_getitems_vvvvvyg);
+	vvvvvyh(add_php_getitems_vvvvvyh);
 
 });
 
-// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvyh function
+// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvyi function
 jQuery('#jform_add_php_getitems_after_all').on('keyup',function()
 {
-	var add_php_getitems_after_all_vvvvvyh = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	var add_php_getitems_after_all_vvvvvyi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvyh(add_php_getitems_after_all_vvvvvyh);
+	vvvvvyi(add_php_getitems_after_all_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems_after_all',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_after_all_vvvvvyh = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	var add_php_getitems_after_all_vvvvvyi = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvyh(add_php_getitems_after_all_vvvvvyh);
+	vvvvvyi(add_php_getitems_after_all_vvvvvyi);
 
 });
 
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvyi function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvyj function
 jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvyi = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvyj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvyi(add_php_getlistquery_vvvvvyi);
+	vvvvvyj(add_php_getlistquery_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvyi = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvyj = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvyi(add_php_getlistquery_vvvvvyi);
+	vvvvvyj(add_php_getlistquery_vvvvvyj);
 
 });
 
-// #jform_add_php_getform listeners for add_php_getform_vvvvvyj function
+// #jform_add_php_getform listeners for add_php_getform_vvvvvyk function
 jQuery('#jform_add_php_getform').on('keyup',function()
 {
-	var add_php_getform_vvvvvyj = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	var add_php_getform_vvvvvyk = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
-	vvvvvyj(add_php_getform_vvvvvyj);
+	vvvvvyk(add_php_getform_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_getform',function (e)
 {
 	e.preventDefault();
-	var add_php_getform_vvvvvyj = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
+	var add_php_getform_vvvvvyk = jQuery("#jform_add_php_getform input[type='radio']:checked").val();
-	vvvvvyj(add_php_getform_vvvvvyj);
+	vvvvvyk(add_php_getform_vvvvvyk);
 
 });
 
-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvyk function
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvyl function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvyk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvyl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvyk(add_php_before_save_vvvvvyk);
+	vvvvvyl(add_php_before_save_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e)
 {
 	e.preventDefault();
-	var add_php_before_save_vvvvvyk = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	var add_php_before_save_vvvvvyl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvyk(add_php_before_save_vvvvvyk);
+	vvvvvyl(add_php_before_save_vvvvvyl);
 
 });
 
-// #jform_add_php_save listeners for add_php_save_vvvvvyl function
+// #jform_add_php_save listeners for add_php_save_vvvvvym function
 jQuery('#jform_add_php_save').on('keyup',function()
 {
-	var add_php_save_vvvvvyl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvym = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvyl(add_php_save_vvvvvyl);
+	vvvvvym(add_php_save_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_save',function (e)
 {
 	e.preventDefault();
-	var add_php_save_vvvvvyl = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	var add_php_save_vvvvvym = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvyl(add_php_save_vvvvvyl);
+	vvvvvym(add_php_save_vvvvvym);
 
 });
 
-// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvym function
+// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvyn function
 jQuery('#jform_add_php_postsavehook').on('keyup',function()
 {
-	var add_php_postsavehook_vvvvvym = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvyn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvym(add_php_postsavehook_vvvvvym);
+	vvvvvyn(add_php_postsavehook_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 {
 	e.preventDefault();
-	var add_php_postsavehook_vvvvvym = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	var add_php_postsavehook_vvvvvyn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvym(add_php_postsavehook_vvvvvym);
+	vvvvvyn(add_php_postsavehook_vvvvvyn);
 
 });
 
-// #jform_add_php_allowadd listeners for add_php_allowadd_vvvvvyn function
+// #jform_add_php_allowadd listeners for add_php_allowadd_vvvvvyo function
 jQuery('#jform_add_php_allowadd').on('keyup',function()
 {
-	var add_php_allowadd_vvvvvyn = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	var add_php_allowadd_vvvvvyo = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
-	vvvvvyn(add_php_allowadd_vvvvvyn);
+	vvvvvyo(add_php_allowadd_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowadd',function (e)
 {
 	e.preventDefault();
-	var add_php_allowadd_vvvvvyn = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	var add_php_allowadd_vvvvvyo = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
-	vvvvvyn(add_php_allowadd_vvvvvyn);
+	vvvvvyo(add_php_allowadd_vvvvvyo);
 
 });
 
-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvyo function
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvyp function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvyo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvyp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvyo(add_php_allowedit_vvvvvyo);
+	vvvvvyp(add_php_allowedit_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvyo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	var add_php_allowedit_vvvvvyp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvyo(add_php_allowedit_vvvvvyo);
+	vvvvvyp(add_php_allowedit_vvvvvyp);
 
 });
 
-// #jform_add_php_before_cancel listeners for add_php_before_cancel_vvvvvyp function
+// #jform_add_php_before_cancel listeners for add_php_before_cancel_vvvvvyq function
 jQuery('#jform_add_php_before_cancel').on('keyup',function()
 {
-	var add_php_before_cancel_vvvvvyp = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	var add_php_before_cancel_vvvvvyq = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
-	vvvvvyp(add_php_before_cancel_vvvvvyp);
+	vvvvvyq(add_php_before_cancel_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_cancel',function (e)
 {
 	e.preventDefault();
-	var add_php_before_cancel_vvvvvyp = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	var add_php_before_cancel_vvvvvyq = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
-	vvvvvyp(add_php_before_cancel_vvvvvyp);
+	vvvvvyq(add_php_before_cancel_vvvvvyq);
 
 });
 
-// #jform_add_php_after_cancel listeners for add_php_after_cancel_vvvvvyq function
+// #jform_add_php_after_cancel listeners for add_php_after_cancel_vvvvvyr function
 jQuery('#jform_add_php_after_cancel').on('keyup',function()
 {
-	var add_php_after_cancel_vvvvvyq = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	var add_php_after_cancel_vvvvvyr = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
-	vvvvvyq(add_php_after_cancel_vvvvvyq);
+	vvvvvyr(add_php_after_cancel_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_cancel',function (e)
 {
 	e.preventDefault();
-	var add_php_after_cancel_vvvvvyq = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	var add_php_after_cancel_vvvvvyr = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
-	vvvvvyq(add_php_after_cancel_vvvvvyq);
+	vvvvvyr(add_php_after_cancel_vvvvvyr);
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvyr function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvys function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvyr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvys = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvyr(add_php_batchcopy_vvvvvyr);
+	vvvvvys(add_php_batchcopy_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvyr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	var add_php_batchcopy_vvvvvys = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvyr(add_php_batchcopy_vvvvvyr);
+	vvvvvys(add_php_batchcopy_vvvvvys);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvys function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvyt function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvys = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvyt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvys(add_php_batchmove_vvvvvys);
+	vvvvvyt(add_php_batchmove_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvys = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	var add_php_batchmove_vvvvvyt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvys(add_php_batchmove_vvvvvys);
+	vvvvvyt(add_php_batchmove_vvvvvyt);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvyt function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvyu function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvyt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvyu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvyt(add_php_before_publish_vvvvvyt);
+	vvvvvyu(add_php_before_publish_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvyt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	var add_php_before_publish_vvvvvyu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvyt(add_php_before_publish_vvvvvyt);
+	vvvvvyu(add_php_before_publish_vvvvvyu);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvyu function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvyv function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvyu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvyv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvyu(add_php_after_publish_vvvvvyu);
+	vvvvvyv(add_php_after_publish_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvyu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	var add_php_after_publish_vvvvvyv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvyu(add_php_after_publish_vvvvvyu);
+	vvvvvyv(add_php_after_publish_vvvvvyv);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvyv function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvyw function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvyv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvyw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvyv(add_php_before_delete_vvvvvyv);
+	vvvvvyw(add_php_before_delete_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvyv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	var add_php_before_delete_vvvvvyw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvyv(add_php_before_delete_vvvvvyv);
+	vvvvvyw(add_php_before_delete_vvvvvyw);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvyw function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvyx function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvyw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvyx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvyw(add_php_after_delete_vvvvvyw);
+	vvvvvyx(add_php_after_delete_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvyw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	var add_php_after_delete_vvvvvyx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvyw(add_php_after_delete_vvvvvyw);
+	vvvvvyx(add_php_after_delete_vvvvvyx);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyx function
+// #jform_add_php_document listeners for add_php_document_vvvvvyy function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyx(add_php_document_vvvvvyx);
+	vvvvvyy(add_php_document_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyx(add_php_document_vvvvvyx);
+	vvvvvyy(add_php_document_vvvvvyy);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvyy function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvyy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyy(add_sql_vvvvvyy);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvyy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyy(add_sql_vvvvvyy);
-
-});
-
-// #jform_source listeners for source_vvvvvyz function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvyz = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvyz = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvyz function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyz = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz);
+	vvvvvyz(add_sql_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyz = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyz(source_vvvvvyz,add_sql_vvvvvyz);
+	vvvvvyz(add_sql_vvvvvyz);
 
 });
 
-// #jform_source listeners for source_vvvvvzb function
+// #jform_source listeners for source_vvvvvza function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvzb = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvza = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvzb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvza = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb);
+	vvvvvza(source_vvvvvza,add_sql_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvzb = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvza = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvzb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvza = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb);
+	vvvvvza(source_vvvvvza,add_sql_vvvvvza);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvzb function
+// #jform_add_sql listeners for add_sql_vvvvvza function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvzb = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvza = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvzb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvza = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb);
+	vvvvvza(source_vvvvvza,add_sql_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvzb = jQuery("#jform_source input[type='radio']:checked").val();
+	var source_vvvvvza = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvzb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvza = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvzb(source_vvvvvzb,add_sql_vvvvvzb);
+	vvvvvza(source_vvvvvza,add_sql_vvvvvza);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvzd function
+// #jform_source listeners for source_vvvvvzc function
-jQuery('#jform_add_custom_import').on('keyup',function()
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvzd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvzc = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvzd(add_custom_import_vvvvvzd);
+	var add_sql_vvvvvzc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvzd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	var source_vvvvvzc = jQuery("#jform_source input[type='radio']:checked").val();
-	vvvvvzd(add_custom_import_vvvvvzd);
+	var add_sql_vvvvvzc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvzc function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvzc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvzc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvzc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvzc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvzc(source_vvvvvzc,add_sql_vvvvvzc);
 
 });
 
@@ -711,18 +696,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvzf function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvzf function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvzf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvzf(add_custom_import_vvvvvzf);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvzf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvzf(add_custom_import_vvvvvzf);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvzg function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvzf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzf(add_custom_button_vvvvvzf);
+	vvvvvzg(add_custom_button_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvzf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzf(add_custom_button_vvvvvzf);
+	vvvvvzg(add_custom_button_vvvvvzg);
 
 });
 

admin/views/class_method/tmpl/edit.php

@@ -112,18 +112,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_extension_type listeners for extension_type_vvvvwbj function
+// #jform_extension_type listeners for extension_type_vvvvwbk function
 jQuery('#jform_extension_type').on('keyup',function()
 {
-	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbk = jQuery("#jform_extension_type").val();
-	vvvvwbj(extension_type_vvvvwbj);
+	vvvvwbk(extension_type_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_extension_type',function (e)
 {
 	e.preventDefault();
-	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbk = jQuery("#jform_extension_type").val();
-	vvvvwbj(extension_type_vvvvwbj);
+	vvvvwbk(extension_type_vvvvwbk);
 
 });
 

admin/views/class_property/tmpl/edit.php

@@ -107,18 +107,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_extension_type listeners for extension_type_vvvvwbi function
+// #jform_extension_type listeners for extension_type_vvvvwbj function
 jQuery('#jform_extension_type').on('keyup',function()
 {
-	var extension_type_vvvvwbi = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
-	vvvvwbi(extension_type_vvvvwbi);
+	vvvvwbj(extension_type_vvvvwbj);
 
 });
 jQuery('#adminForm').on('change', '#jform_extension_type',function (e)
 {
 	e.preventDefault();
-	var extension_type_vvvvwbi = jQuery("#jform_extension_type").val();
+	var extension_type_vvvvwbj = jQuery("#jform_extension_type").val();
-	vvvvwbi(extension_type_vvvvwbi);
+	vvvvwbj(extension_type_vvvvwbj);
 
 });
 

admin/views/custom_admin_view/tmpl/edit.php

@@ -163,153 +163,153 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzg function
+// #jform_add_php_view listeners for add_php_view_vvvvvzh function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzg(add_php_view_vvvvvzg);
+	vvvvvzh(add_php_view_vvvvvzh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzg(add_php_view_vvvvvzg);
+	vvvvvzh(add_php_view_vvvvvzh);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvzh function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvzi function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvzh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzh(add_php_jview_display_vvvvvzh);
+	vvvvvzi(add_php_jview_display_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvzh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzh(add_php_jview_display_vvvvvzh);
+	vvvvvzi(add_php_jview_display_vvvvvzi);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvzi function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvzj function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvzi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzi(add_php_jview_vvvvvzi);
+	vvvvvzj(add_php_jview_vvvvvzj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvzi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzi(add_php_jview_vvvvvzi);
+	vvvvvzj(add_php_jview_vvvvvzj);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvzj function
+// #jform_add_php_document listeners for add_php_document_vvvvvzk function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvzj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzj(add_php_document_vvvvvzj);
+	vvvvvzk(add_php_document_vvvvvzk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvzj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzj(add_php_document_vvvvvzj);
+	vvvvvzk(add_php_document_vvvvvzk);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvzk function
+// #jform_add_css_document listeners for add_css_document_vvvvvzl function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvzk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzk(add_css_document_vvvvvzk);
+	vvvvvzl(add_css_document_vvvvvzl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvzk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzk(add_css_document_vvvvvzk);
+	vvvvvzl(add_css_document_vvvvvzl);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvzl function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvzm function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvzl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzm = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzl(add_javascript_file_vvvvvzl);
+	vvvvvzm(add_javascript_file_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvzl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzm = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzl(add_javascript_file_vvvvvzl);
+	vvvvvzm(add_javascript_file_vvvvvzm);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvzm function
+// #jform_add_js_document listeners for add_js_document_vvvvvzn function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvzm = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzm(add_js_document_vvvvvzm);
+	vvvvvzn(add_js_document_vvvvvzn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvzm = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzm(add_js_document_vvvvvzm);
+	vvvvvzn(add_js_document_vvvvvzn);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvzn function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvzo function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvzn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzn(add_custom_button_vvvvvzn);
+	vvvvvzo(add_custom_button_vvvvvzo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvzn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvzo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzn(add_custom_button_vvvvvzn);
+	vvvvvzo(add_custom_button_vvvvvzo);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvzo function
+// #jform_add_css listeners for add_css_vvvvvzp function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvzo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzo(add_css_vvvvvzo);
+	vvvvvzp(add_css_vvvvvzp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvzo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzo(add_css_vvvvvzo);
+	vvvvvzp(add_css_vvvvvzp);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzp function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzq function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvzp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzp(add_php_ajax_vvvvvzp);
+	vvvvvzq(add_php_ajax_vvvvvzq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvzp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzp(add_php_ajax_vvvvvzp);
+	vvvvvzq(add_php_ajax_vvvvvzq);
 
 });
 

admin/views/custom_code/tmpl/edit.php

@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwbe function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwbe = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbe(target_vvvvwbe);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwbe = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbe(target_vvvvwbe);
-
-});
-
 // #jform_target listeners for target_vvvvwbf function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -150,67 +135,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwbg = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwbg = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbg(target_vvvvwbg);
-	vvvvwbg(target_vvvvwbg,type_vvvvwbg);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwbg = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwbg = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbg(target_vvvvwbg);
-	vvvvwbg(target_vvvvwbg,type_vvvvwbg);
-
-});
-
-// #jform_type listeners for type_vvvvwbg function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwbg = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwbg = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwbg(target_vvvvwbg,type_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwbg = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwbg = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwbg(target_vvvvwbg,type_vvvvwbg);
-
-});
-
-// #jform_type listeners for type_vvvvwbh function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbh(type_vvvvwbh,target_vvvvwbh);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbh(type_vvvvwbh,target_vvvvwbh);
 
 });
 
 // #jform_target listeners for target_vvvvwbh function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbh(type_vvvvwbh,target_vvvvwbh);
+	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbh(target_vvvvwbh,type_vvvvwbh);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbh(type_vvvvwbh,target_vvvvwbh);
+	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbh(target_vvvvwbh,type_vvvvwbh);
+
+});
+
+// #jform_type listeners for type_vvvvwbh function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbh(target_vvvvwbh,type_vvvvwbh);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbh = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbh = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbh(target_vvvvwbh,type_vvvvwbh);
+
+});
+
+// #jform_type listeners for type_vvvvwbi function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbi = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbi(type_vvvvwbi,target_vvvvwbi);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbi = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbi(type_vvvvwbi,target_vvvvwbi);
+
+});
+
+// #jform_target listeners for target_vvvvwbi function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwbi = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbi(type_vvvvwbi,target_vvvvwbi);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbi = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbi(type_vvvvwbi,target_vvvvwbi);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -159,33 +159,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvwad function
+// #jform_gettype listeners for gettype_vvvvwae function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	vvvvwad(gettype_vvvvwad);
+	vvvvwae(gettype_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	vvvvwad(gettype_vvvvwad);
+	vvvvwae(gettype_vvvvwae);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvwae function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvwae = jQuery("#jform_main_source").val();
-	vvvvwae(main_source_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvwae = jQuery("#jform_main_source").val();
-	vvvvwae(main_source_vvvvwae);
 
 });
 
@@ -249,18 +234,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvwaj function
+// #jform_main_source listeners for main_source_vvvvwaj function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvwaj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvwaj = jQuery("#jform_main_source").val();
-	vvvvwaj(addcalculation_vvvvwaj);
+	vvvvwaj(main_source_vvvvwaj);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvwaj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvwaj = jQuery("#jform_main_source").val();
-	vvvvwaj(addcalculation_vvvvwaj);
+	vvvvwaj(main_source_vvvvwaj);
 
 });
 
@@ -268,33 +253,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvwak = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvwak = jQuery("#jform_gettype").val();
+	vvvvwak(addcalculation_vvvvwak);
-	vvvvwak(addcalculation_vvvvwak,gettype_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvwak = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvwak = jQuery("#jform_gettype").val();
+	vvvvwak(addcalculation_vvvvwak);
-	vvvvwak(addcalculation_vvvvwak,gettype_vvvvwak);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvwak function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvwak = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvwak = jQuery("#jform_gettype").val();
-	vvvvwak(addcalculation_vvvvwak,gettype_vvvvwak);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvwak = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvwak = jQuery("#jform_gettype").val();
-	vvvvwak(addcalculation_vvvvwak,gettype_vvvvwak);
 
 });
 
@@ -332,18 +298,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvwao function
+// #jform_addcalculation listeners for addcalculation_vvvvwam function
-jQuery('#jform_main_source').on('keyup',function()
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvwao = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvwam = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvwao(main_source_vvvvwao);
+	var gettype_vvvvwam = jQuery("#jform_gettype").val();
+	vvvvwam(addcalculation_vvvvwam,gettype_vvvvwam);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvwao = jQuery("#jform_main_source").val();
+	var addcalculation_vvvvwam = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvwao(main_source_vvvvwao);
+	var gettype_vvvvwam = jQuery("#jform_gettype").val();
+	vvvvwam(addcalculation_vvvvwam,gettype_vvvvwam);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvwam function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvwam = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvwam = jQuery("#jform_gettype").val();
+	vvvvwam(addcalculation_vvvvwam,gettype_vvvvwam);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvwam = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvwam = jQuery("#jform_gettype").val();
+	vvvvwam(addcalculation_vvvvwam,gettype_vvvvwam);
 
 });
 
@@ -362,203 +347,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvwaq function
+// #jform_main_source listeners for main_source_vvvvwaq function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvwaq = jQuery("#jform_main_source").val();
+	vvvvwaq(main_source_vvvvwaq);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvwaq = jQuery("#jform_main_source").val();
+	vvvvwaq(main_source_vvvvwaq);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvwar function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvwaq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvwar = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvwaq = jQuery("#jform_gettype").val();
+	var gettype_vvvvwar = jQuery("#jform_gettype").val();
-	vvvvwaq(add_php_before_getitem_vvvvwaq,gettype_vvvvwaq);
+	vvvvwar(add_php_before_getitem_vvvvwar,gettype_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvwaq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvwar = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvwaq = jQuery("#jform_gettype").val();
-	vvvvwaq(add_php_before_getitem_vvvvwaq,gettype_vvvvwaq);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvwaq function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvwaq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvwaq = jQuery("#jform_gettype").val();
-	vvvvwaq(add_php_before_getitem_vvvvwaq,gettype_vvvvwaq);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvwaq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvwaq = jQuery("#jform_gettype").val();
-	vvvvwaq(add_php_before_getitem_vvvvwaq,gettype_vvvvwaq);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvwar function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvwar = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvwar = jQuery("#jform_gettype").val();
-	vvvvwar(add_php_after_getitem_vvvvwar,gettype_vvvvwar);
+	vvvvwar(add_php_before_getitem_vvvvwar,gettype_vvvvwar);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvwar = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvwar = jQuery("#jform_gettype").val();
-	vvvvwar(add_php_after_getitem_vvvvwar,gettype_vvvvwar);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvwar function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvwar = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvwar = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvwar = jQuery("#jform_gettype").val();
-	vvvvwar(add_php_after_getitem_vvvvwar,gettype_vvvvwar);
+	vvvvwar(add_php_before_getitem_vvvvwar,gettype_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvwar = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvwar = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvwar = jQuery("#jform_gettype").val();
-	vvvvwar(add_php_after_getitem_vvvvwar,gettype_vvvvwar);
+	vvvvwar(add_php_before_getitem_vvvvwar,gettype_vvvvwar);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwat function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvwas function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvwas = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvwas = jQuery("#jform_gettype").val();
+	vvvvwas(add_php_after_getitem_vvvvwas,gettype_vvvvwas);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvwas = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvwas = jQuery("#jform_gettype").val();
+	vvvvwas(add_php_after_getitem_vvvvwas,gettype_vvvvwas);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvwas function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwat = jQuery("#jform_gettype").val();
+	var add_php_after_getitem_vvvvwas = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvwat(gettype_vvvvwat);
+	var gettype_vvvvwas = jQuery("#jform_gettype").val();
+	vvvvwas(add_php_after_getitem_vvvvwas,gettype_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwat = jQuery("#jform_gettype").val();
+	var add_php_after_getitem_vvvvwas = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	vvvvwat(gettype_vvvvwat);
+	var gettype_vvvvwas = jQuery("#jform_gettype").val();
-
+	vvvvwas(add_php_after_getitem_vvvvwas,gettype_vvvvwas);
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvwau function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvwau = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvwau = jQuery("#jform_gettype").val();
-	vvvvwau(add_php_getlistquery_vvvvwau,gettype_vvvvwau);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvwau = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvwau = jQuery("#jform_gettype").val();
-	vvvvwau(add_php_getlistquery_vvvvwau,gettype_vvvvwau);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvwau function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvwau = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwau = jQuery("#jform_gettype").val();
-	vvvvwau(add_php_getlistquery_vvvvwau,gettype_vvvvwau);
+	vvvvwau(gettype_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvwau = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwau = jQuery("#jform_gettype").val();
-	vvvvwau(add_php_getlistquery_vvvvwau,gettype_vvvvwau);
+	vvvvwau(gettype_vvvvwau);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvwav function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvwav function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvwav = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvwav = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwav = jQuery("#jform_gettype").val();
-	vvvvwav(add_php_before_getitems_vvvvwav,gettype_vvvvwav);
+	vvvvwav(add_php_getlistquery_vvvvwav,gettype_vvvvwav);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvwav = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvwav = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwav = jQuery("#jform_gettype").val();
-	vvvvwav(add_php_before_getitems_vvvvwav,gettype_vvvvwav);
+	vvvvwav(add_php_getlistquery_vvvvwav,gettype_vvvvwav);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvwav function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvwav = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvwav = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwav = jQuery("#jform_gettype").val();
-	vvvvwav(add_php_before_getitems_vvvvwav,gettype_vvvvwav);
+	vvvvwav(add_php_getlistquery_vvvvwav,gettype_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvwav = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvwav = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvwav = jQuery("#jform_gettype").val();
-	vvvvwav(add_php_before_getitems_vvvvwav,gettype_vvvvwav);
+	vvvvwav(add_php_getlistquery_vvvvwav,gettype_vvvvwav);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvwaw function
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvwaw function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvwaw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvwaw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvwaw = jQuery("#jform_gettype").val();
-	vvvvwaw(add_php_after_getitems_vvvvwaw,gettype_vvvvwaw);
+	vvvvwaw(add_php_before_getitems_vvvvwaw,gettype_vvvvwaw);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvwaw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvwaw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvwaw = jQuery("#jform_gettype").val();
-	vvvvwaw(add_php_after_getitems_vvvvwaw,gettype_vvvvwaw);
+	vvvvwaw(add_php_before_getitems_vvvvwaw,gettype_vvvvwaw);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvwaw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvwaw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvwaw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvwaw = jQuery("#jform_gettype").val();
-	vvvvwaw(add_php_after_getitems_vvvvwaw,gettype_vvvvwaw);
+	vvvvwaw(add_php_before_getitems_vvvvwaw,gettype_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvwaw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvwaw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvwaw = jQuery("#jform_gettype").val();
-	vvvvwaw(add_php_after_getitems_vvvvwaw,gettype_vvvvwaw);
+	vvvvwaw(add_php_before_getitems_vvvvwaw,gettype_vvvvwaw);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvway function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvwax function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvwax = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvwax = jQuery("#jform_gettype").val();
+	vvvvwax(add_php_after_getitems_vvvvwax,gettype_vvvvwax);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvwax = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvwax = jQuery("#jform_gettype").val();
+	vvvvwax(add_php_after_getitems_vvvvwax,gettype_vvvvwax);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvwax function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvway = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvwax = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvway(gettype_vvvvway);
+	var gettype_vvvvwax = jQuery("#jform_gettype").val();
+	vvvvwax(add_php_after_getitems_vvvvwax,gettype_vvvvwax);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvway = jQuery("#jform_gettype").val();
+	var add_php_after_getitems_vvvvwax = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
-	vvvvway(gettype_vvvvway);
+	var gettype_vvvvwax = jQuery("#jform_gettype").val();
+	vvvvwax(add_php_after_getitems_vvvvwax,gettype_vvvvwax);
 
 });
 
@@ -596,48 +581,63 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvwbb = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwbb = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwbb(gettype_vvvvwbb);
-	vvvvwbb(gettype_vvvvwbb,add_php_router_parse_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvwbb = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwbb = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwbb(gettype_vvvvwbb);
-	vvvvwbb(gettype_vvvvwbb,add_php_router_parse_vvvvwbb);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwbb function
+// #jform_gettype listeners for gettype_vvvvwbc function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvwbc = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwbc = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwbc(gettype_vvvvwbc,add_php_router_parse_vvvvwbc);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvwbc = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwbc = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwbc(gettype_vvvvwbc,add_php_router_parse_vvvvwbc);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwbc function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvwbb = jQuery("#jform_gettype").val();
+	var gettype_vvvvwbc = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwbb = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvwbc = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwbb(gettype_vvvvwbb,add_php_router_parse_vvvvwbb);
+	vvvvwbc(gettype_vvvvwbc,add_php_router_parse_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwbb = jQuery("#jform_gettype").val();
+	var gettype_vvvvwbc = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwbb = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	var add_php_router_parse_vvvvwbc = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwbb(gettype_vvvvwbb,add_php_router_parse_vvvvwbb);
+	vvvvwbc(gettype_vvvvwbc,add_php_router_parse_vvvvwbc);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwbd function
+// #jform_gettype listeners for gettype_vvvvwbe function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwbd = jQuery("#jform_gettype").val();
+	var gettype_vvvvwbe = jQuery("#jform_gettype").val();
-	vvvvwbd(gettype_vvvvwbd);
+	vvvvwbe(gettype_vvvvwbe);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwbd = jQuery("#jform_gettype").val();
+	var gettype_vvvvwbe = jQuery("#jform_gettype").val();
-	vvvvwbd(gettype_vvvvwbd);
+	vvvvwbe(gettype_vvvvwbe);
 
 });
 

admin/views/field/tmpl/edit.php

@@ -147,48 +147,33 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwbs function
+// #jform_datalenght listeners for datalenght_vvvvwbt function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwbs = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
-	vvvvwbs(datalenght_vvvvwbs);
+	vvvvwbt(datalenght_vvvvwbt);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbs = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
-	vvvvwbs(datalenght_vvvvwbs);
+	vvvvwbt(datalenght_vvvvwbt);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwbt function
+// #jform_datadefault listeners for datadefault_vvvvwbu function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwbt = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
-	vvvvwbt(datadefault_vvvvwbt);
+	vvvvwbu(datadefault_vvvvwbu);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbt = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
-	vvvvwbt(datadefault_vvvvwbt);
+	vvvvwbu(datadefault_vvvvwbu);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbu function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbu = jQuery("#jform_datatype").val();
-	vvvvwbu(datatype_vvvvwbu);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbu = jQuery("#jform_datatype").val();
-	vvvvwbu(datatype_vvvvwbu);
 
 });
 
@@ -207,97 +192,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwbw function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwbw = jQuery("#jform_store").val();
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(store_vvvvwbw,datatype_vvvvwbw);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwbw = jQuery("#jform_store").val();
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(store_vvvvwbw,datatype_vvvvwbw);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwbw function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwbw = jQuery("#jform_store").val();
 	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(store_vvvvwbw,datatype_vvvvwbw);
+	vvvvwbw(datatype_vvvvwbw);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbw = jQuery("#jform_store").val();
 	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
-	vvvvwbw(store_vvvvwbw,datatype_vvvvwbw);
+	vvvvwbw(datatype_vvvvwbw);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwby function
+// #jform_store listeners for store_vvvvwbx function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwbx = jQuery("#jform_store").val();
+	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwbx = jQuery("#jform_store").val();
+	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbx function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwbx = jQuery("#jform_store").val();
+	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwbx = jQuery("#jform_store").val();
+	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwbz function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwby = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwby(add_css_view_vvvvwby);
+	vvvvwbz(add_css_view_vvvvwbz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwby = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwby(add_css_view_vvvvwby);
+	vvvvwbz(add_css_view_vvvvwbz);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwbz function
+// #jform_add_css_views listeners for add_css_views_vvvvwca function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwbz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwbz(add_css_views_vvvvwbz);
+	vvvvwca(add_css_views_vvvvwca);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwbz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwbz(add_css_views_vvvvwbz);
+	vvvvwca(add_css_views_vvvvwca);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwca function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwcb function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwca = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwca(add_javascript_view_footer_vvvvwca);
+	vvvvwcb(add_javascript_view_footer_vvvvwcb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwca = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwca(add_javascript_view_footer_vvvvwca);
+	vvvvwcb(add_javascript_view_footer_vvvvwcb);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwcb function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwcc function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwcb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_views_footer_vvvvwcb);
+	vvvvwcc(add_javascript_views_footer_vvvvwcc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwcb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_views_footer_vvvvwcb);
+	vvvvwcc(add_javascript_views_footer_vvvvwcc);
 
 });
 

admin/views/fieldtype/tmpl/edit.php

@@ -136,344 +136,287 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwcc function
+// #jform_datalenght listeners for datalenght_vvvvwcd function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcc(datalenght_vvvvwcc,has_defaults_vvvvwcc);
+	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcc(datalenght_vvvvwcc,has_defaults_vvvvwcc);
+	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwcc function
+// #jform_has_defaults listeners for has_defaults_vvvvwcd function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcc(datalenght_vvvvwcc,has_defaults_vvvvwcc);
+	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcc(datalenght_vvvvwcc,has_defaults_vvvvwcc);
+	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwce function
+// #jform_datadefault listeners for datadefault_vvvvwcf function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwce = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datadefault_vvvvwce,has_defaults_vvvvwce);
+	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwce = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datadefault_vvvvwce,has_defaults_vvvvwce);
+	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwce function
+// #jform_has_defaults listeners for has_defaults_vvvvwcf function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datadefault_vvvvwce = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datadefault_vvvvwce,has_defaults_vvvvwce);
+	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwce = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datadefault_vvvvwce,has_defaults_vvvvwce);
+	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcg function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datatype_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datatype_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwcg function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datatype_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datatype_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwch function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwch(has_defaults_vvvvwch,datatype_vvvvwch);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwch(has_defaults_vvvvwch,datatype_vvvvwch);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwch function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwch(has_defaults_vvvvwch,datatype_vvvvwch);
+	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwch(has_defaults_vvvvwch,datatype_vvvvwch);
+	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwci function
+// #jform_has_defaults listeners for has_defaults_vvvvwch function
-jQuery('#jform_datatype').on('keyup',function()
+jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
+	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
 
 });
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
+	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwci function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
 
 });
 
-// #jform_store listeners for store_vvvvwck function
+// #jform_datatype listeners for datatype_vvvvwci function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwck = jQuery("#jform_store").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwck = jQuery("#jform_store").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwck function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwck = jQuery("#jform_store").val();
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwck = jQuery("#jform_store").val();
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwck function
+// #jform_datatype listeners for datatype_vvvvwcj function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcj function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var store_vvvvwck = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwck = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
-	vvvvwck(store_vvvvwck,datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcl function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
 
 });
 
 // #jform_store listeners for store_vvvvwcl function
 jQuery('#jform_store').on('keyup',function()
 {
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcl function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwcl function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var store_vvvvwcl = jQuery("#jform_store").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(datatype_vvvvwcl,store_vvvvwcl,has_defaults_vvvvwcl);
+	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwcm function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
-
-});
-
-// #jform_store listeners for store_vvvvwcm function
-jQuery('#jform_store').on('keyup',function()
-{
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwcm function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	vvvvwcm(has_defaults_vvvvwcm,store_vvvvwcm,datatype_vvvvwcm);
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+
+});
+
+// #jform_store listeners for store_vvvvwcm function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcm function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
+	var store_vvvvwcm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 
@@ -481,14 +424,71 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 jQuery('#jform_has_defaults').on('keyup',function()
 {
 	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcn(has_defaults_vvvvwcn);
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
 	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcn(has_defaults_vvvvwcn);
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+
+});
+
+// #jform_store listeners for store_vvvvwcn function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcn function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcn = jQuery("#jform_store").val();
+	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
+	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwco function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(has_defaults_vvvvwco);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(has_defaults_vvvvwco);
 
 });
 

admin/views/help_document/tmpl/edit.php

@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwcy function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwcy = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcy(location_vvvvwcy);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwcy = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcy(location_vvvvwcy);
-
-});
-
 // #jform_location listeners for location_vvvvwcz function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -146,18 +131,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwda function
+// #jform_location listeners for location_vvvvwda function
-jQuery('#jform_type').on('keyup',function()
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwda = jQuery("#jform_type").val();
+	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(type_vvvvwda);
+	vvvvwda(location_vvvvwda);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwda = jQuery("#jform_type").val();
+	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(type_vvvvwda);
+	vvvvwda(location_vvvvwda);
 
 });
 
@@ -191,18 +176,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwdd function
+// #jform_type listeners for type_vvvvwdd function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwdd = jQuery("#jform_type").val();
+	vvvvwdd(type_vvvvwdd);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwdd = jQuery("#jform_type").val();
+	vvvvwdd(type_vvvvwdd);
+
+});
+
+// #jform_target listeners for target_vvvvwde function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwdd = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwdd(target_vvvvwdd);
+	vvvvwde(target_vvvvwde);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwdd = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwdd(target_vvvvwdd);
+	vvvvwde(target_vvvvwde);
 
 });
 

admin/views/joomla_plugin/tmpl/edit.php

@@ -276,319 +276,334 @@ jQuery('#adminForm').on('change', '#jform_class_extends',function (e)
 
 });
 
-// #jform_add_php_preflight_install listeners for add_php_preflight_install_vvvvvxg function
+// #jform_add_php_script_construct listeners for add_php_script_construct_vvvvvxg function
+jQuery('#jform_add_php_script_construct').on('keyup',function()
+{
+	var add_php_script_construct_vvvvvxg = jQuery("#jform_add_php_script_construct input[type='radio']:checked").val();
+	vvvvvxg(add_php_script_construct_vvvvvxg);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_script_construct',function (e)
+{
+	e.preventDefault();
+	var add_php_script_construct_vvvvvxg = jQuery("#jform_add_php_script_construct input[type='radio']:checked").val();
+	vvvvvxg(add_php_script_construct_vvvvvxg);
+
+});
+
+// #jform_add_php_preflight_install listeners for add_php_preflight_install_vvvvvxh function
 jQuery('#jform_add_php_preflight_install').on('keyup',function()
 {
-	var add_php_preflight_install_vvvvvxg = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	var add_php_preflight_install_vvvvvxh = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvxg(add_php_preflight_install_vvvvvxg);
+	vvvvvxh(add_php_preflight_install_vvvvvxh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_preflight_install',function (e)
 {
 	e.preventDefault();
-	var add_php_preflight_install_vvvvvxg = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	var add_php_preflight_install_vvvvvxh = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvxg(add_php_preflight_install_vvvvvxg);
+	vvvvvxh(add_php_preflight_install_vvvvvxh);
 
 });
 
-// #jform_add_php_preflight_update listeners for add_php_preflight_update_vvvvvxh function
+// #jform_add_php_preflight_update listeners for add_php_preflight_update_vvvvvxi function
 jQuery('#jform_add_php_preflight_update').on('keyup',function()
 {
-	var add_php_preflight_update_vvvvvxh = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	var add_php_preflight_update_vvvvvxi = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvxh(add_php_preflight_update_vvvvvxh);
+	vvvvvxi(add_php_preflight_update_vvvvvxi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_preflight_update',function (e)
 {
 	e.preventDefault();
-	var add_php_preflight_update_vvvvvxh = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	var add_php_preflight_update_vvvvvxi = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvxh(add_php_preflight_update_vvvvvxh);
+	vvvvvxi(add_php_preflight_update_vvvvvxi);
 
 });
 
-// #jform_add_php_preflight_uninstall listeners for add_php_preflight_uninstall_vvvvvxi function
+// #jform_add_php_preflight_uninstall listeners for add_php_preflight_uninstall_vvvvvxj function
 jQuery('#jform_add_php_preflight_uninstall').on('keyup',function()
 {
-	var add_php_preflight_uninstall_vvvvvxi = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
+	var add_php_preflight_uninstall_vvvvvxj = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
-	vvvvvxi(add_php_preflight_uninstall_vvvvvxi);
+	vvvvvxj(add_php_preflight_uninstall_vvvvvxj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_preflight_uninstall',function (e)
 {
 	e.preventDefault();
-	var add_php_preflight_uninstall_vvvvvxi = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
+	var add_php_preflight_uninstall_vvvvvxj = jQuery("#jform_add_php_preflight_uninstall input[type='radio']:checked").val();
-	vvvvvxi(add_php_preflight_uninstall_vvvvvxi);
+	vvvvvxj(add_php_preflight_uninstall_vvvvvxj);
 
 });
 
-// #jform_add_php_postflight_install listeners for add_php_postflight_install_vvvvvxj function
+// #jform_add_php_postflight_install listeners for add_php_postflight_install_vvvvvxk function
 jQuery('#jform_add_php_postflight_install').on('keyup',function()
 {
-	var add_php_postflight_install_vvvvvxj = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	var add_php_postflight_install_vvvvvxk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvxj(add_php_postflight_install_vvvvvxj);
+	vvvvvxk(add_php_postflight_install_vvvvvxk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_postflight_install',function (e)
 {
 	e.preventDefault();
-	var add_php_postflight_install_vvvvvxj = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	var add_php_postflight_install_vvvvvxk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvxj(add_php_postflight_install_vvvvvxj);
+	vvvvvxk(add_php_postflight_install_vvvvvxk);
 
 });
 
-// #jform_add_php_postflight_update listeners for add_php_postflight_update_vvvvvxk function
+// #jform_add_php_postflight_update listeners for add_php_postflight_update_vvvvvxl function
 jQuery('#jform_add_php_postflight_update').on('keyup',function()
 {
-	var add_php_postflight_update_vvvvvxk = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	var add_php_postflight_update_vvvvvxl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvxk(add_php_postflight_update_vvvvvxk);
+	vvvvvxl(add_php_postflight_update_vvvvvxl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_postflight_update',function (e)
 {
 	e.preventDefault();
-	var add_php_postflight_update_vvvvvxk = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	var add_php_postflight_update_vvvvvxl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvxk(add_php_postflight_update_vvvvvxk);
+	vvvvvxl(add_php_postflight_update_vvvvvxl);
 
 });
 
-// #jform_add_php_method_uninstall listeners for add_php_method_uninstall_vvvvvxl function
+// #jform_add_php_method_uninstall listeners for add_php_method_uninstall_vvvvvxm function
 jQuery('#jform_add_php_method_uninstall').on('keyup',function()
 {
-	var add_php_method_uninstall_vvvvvxl = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	var add_php_method_uninstall_vvvvvxm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvxl(add_php_method_uninstall_vvvvvxl);
+	vvvvvxm(add_php_method_uninstall_vvvvvxm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_method_uninstall',function (e)
 {
 	e.preventDefault();
-	var add_php_method_uninstall_vvvvvxl = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	var add_php_method_uninstall_vvvvvxm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvxl(add_php_method_uninstall_vvvvvxl);
+	vvvvvxm(add_php_method_uninstall_vvvvvxm);
-
-});
-
-// #jform_update_server_target listeners for update_server_target_vvvvvxm function
-jQuery('#jform_update_server_target').on('keyup',function()
-{
-	var update_server_target_vvvvvxm = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxm = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm);
-
-});
-jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
-{
-	e.preventDefault();
-	var update_server_target_vvvvvxm = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxm = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm);
-
-});
-
-// #jform_add_update_server listeners for add_update_server_vvvvvxm function
-jQuery('#jform_add_update_server').on('keyup',function()
-{
-	var update_server_target_vvvvvxm = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxm = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
-{
-	e.preventDefault();
-	var update_server_target_vvvvvxm = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxm = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxm(update_server_target_vvvvvxm,add_update_server_vvvvvxm);
-
-});
-
-// #jform_add_update_server listeners for add_update_server_vvvvvxn function
-jQuery('#jform_add_update_server').on('keyup',function()
-{
-	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
-{
-	e.preventDefault();
-	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn);
 
 });
 
 // #jform_update_server_target listeners for update_server_target_vvvvvxn function
 jQuery('#jform_update_server_target').on('keyup',function()
 {
-	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn);
+	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn);
 
 });
 jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxn(add_update_server_vvvvvxn,update_server_target_vvvvvxn);
+	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn);
 
 });
 
-// #jform_update_server_target listeners for update_server_target_vvvvvxo function
+// #jform_add_update_server listeners for add_update_server_vvvvvxn function
-jQuery('#jform_update_server_target').on('keyup',function()
+jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo);
+	vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn);
 
 });
-jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var update_server_target_vvvvvxn = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxn = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo);
+	vvvvvxn(update_server_target_vvvvvxn,add_update_server_vvvvvxn);
 
 });
 
 // #jform_add_update_server listeners for add_update_server_vvvvvxo function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo);
+	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxo(update_server_target_vvvvvxo,add_update_server_vvvvvxo);
+	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo);
 
 });
 
-// #jform_update_server_target listeners for update_server_target_vvvvvxq function
+// #jform_update_server_target listeners for update_server_target_vvvvvxo function
 jQuery('#jform_update_server_target').on('keyup',function()
 {
-	var update_server_target_vvvvvxq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var add_update_server_vvvvvxq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq);
+	vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo);
 
 });
 jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvxq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	var add_update_server_vvvvvxq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvxo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq);
+	vvvvvxo(add_update_server_vvvvvxo,update_server_target_vvvvvxo);
 
 });
 
-// #jform_add_update_server listeners for add_update_server_vvvvvxq function
+// #jform_update_server_target listeners for update_server_target_vvvvvxp function
+jQuery('#jform_update_server_target').on('keyup',function()
+{
+	var update_server_target_vvvvvxp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp);
+
+});
+jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+{
+	e.preventDefault();
+	var update_server_target_vvvvvxp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp);
+
+});
+
+// #jform_add_update_server listeners for add_update_server_vvvvvxp function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var update_server_target_vvvvvxq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var update_server_target_vvvvvxp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq);
+	vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var update_server_target_vvvvvxq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var update_server_target_vvvvvxp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvxq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxq(update_server_target_vvvvvxq,add_update_server_vvvvvxq);
+	vvvvvxp(update_server_target_vvvvvxp,add_update_server_vvvvvxp);
 
 });
 
-// #jform_add_update_server listeners for add_update_server_vvvvvxs function
+// #jform_update_server_target listeners for update_server_target_vvvvvxr function
+jQuery('#jform_update_server_target').on('keyup',function()
+{
+	var update_server_target_vvvvvxr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr);
+
+});
+jQuery('#adminForm').on('change', '#jform_update_server_target',function (e)
+{
+	e.preventDefault();
+	var update_server_target_vvvvvxr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvxr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr);
+
+});
+
+// #jform_add_update_server listeners for add_update_server_vvvvvxr function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var add_update_server_vvvvvxs = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvxr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxs(add_update_server_vvvvvxs);
+	var add_update_server_vvvvvxr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvxs = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var update_server_target_vvvvvxr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvxs(add_update_server_vvvvvxs);
+	var add_update_server_vvvvvxr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxr(update_server_target_vvvvvxr,add_update_server_vvvvvxr);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvxt function
+// #jform_add_update_server listeners for add_update_server_vvvvvxt function
+jQuery('#jform_add_update_server').on('keyup',function()
+{
+	var add_update_server_vvvvvxt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxt(add_update_server_vvvvvxt);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
+{
+	e.preventDefault();
+	var add_update_server_vvvvvxt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvxt(add_update_server_vvvvvxt);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvxu function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(add_sql_vvvvvxt);
+	vvvvvxu(add_sql_vvvvvxu);
 
 });
 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_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(add_sql_vvvvvxt);
+	vvvvvxu(add_sql_vvvvvxu);
 
 });
 
-// #jform_add_sql_uninstall listeners for add_sql_uninstall_vvvvvxu function
+// #jform_add_sql_uninstall listeners for add_sql_uninstall_vvvvvxv function
 jQuery('#jform_add_sql_uninstall').on('keyup',function()
 {
-	var add_sql_uninstall_vvvvvxu = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	var add_sql_uninstall_vvvvvxv = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
-	vvvvvxu(add_sql_uninstall_vvvvvxu);
+	vvvvvxv(add_sql_uninstall_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql_uninstall',function (e)
 {
 	e.preventDefault();
-	var add_sql_uninstall_vvvvvxu = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
+	var add_sql_uninstall_vvvvvxv = jQuery("#jform_add_sql_uninstall input[type='radio']:checked").val();
-	vvvvvxu(add_sql_uninstall_vvvvvxu);
+	vvvvvxv(add_sql_uninstall_vvvvvxv);
 
 });
 
-// #jform_add_update_server listeners for add_update_server_vvvvvxv function
+// #jform_add_update_server listeners for add_update_server_vvvvvxw function
 jQuery('#jform_add_update_server').on('keyup',function()
 {
-	var add_update_server_vvvvvxv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxw = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxv(add_update_server_vvvvvxv);
+	vvvvvxw(add_update_server_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 {
 	e.preventDefault();
-	var add_update_server_vvvvvxv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	var add_update_server_vvvvvxw = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvxv(add_update_server_vvvvvxv);
+	vvvvvxw(add_update_server_vvvvvxw);
 
 });
 
-// #jform_add_sales_server listeners for add_sales_server_vvvvvxw function
+// #jform_add_sales_server listeners for add_sales_server_vvvvvxx function
 jQuery('#jform_add_sales_server').on('keyup',function()
 {
-	var add_sales_server_vvvvvxw = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	var add_sales_server_vvvvvxx = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvxw(add_sales_server_vvvvvxw);
+	vvvvvxx(add_sales_server_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sales_server',function (e)
 {
 	e.preventDefault();
-	var add_sales_server_vvvvvxw = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	var add_sales_server_vvvvvxx = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvxw(add_sales_server_vvvvvxw);
+	vvvvvxx(add_sales_server_vvvvvxx);
 
 });
 
-// #jform_addreadme listeners for addreadme_vvvvvxx function
+// #jform_addreadme listeners for addreadme_vvvvvxy function
 jQuery('#jform_addreadme').on('keyup',function()
 {
-	var addreadme_vvvvvxx = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	var addreadme_vvvvvxy = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvxx(addreadme_vvvvvxx);
+	vvvvvxy(addreadme_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_addreadme',function (e)
 {
 	e.preventDefault();
-	var addreadme_vvvvvxx = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	var addreadme_vvvvvxy = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvxx(addreadme_vvvvvxx);
+	vvvvvxy(addreadme_vvvvvxy);
 
 });
 

admin/views/joomla_plugin_updates/submitbutton.js

@@ -0,0 +1,25 @@
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla.submitbutton = function(task)
+{
+	if (task == ''){
+		return false;
+	} else { 
+		var action = task.split('.');
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
+			return true;
+		} else {
+			alert(Joomla.JText._('joomla_plugin_updates, some values are not acceptable.','Some values are unacceptable'));
+			return false;
+		}
+	}
+}

admin/views/joomla_plugin_updates/tmpl/edit.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.keepalive');
+$componentParams = $this->params; // will be removed just use $this->params instead
+?>
+<script type="text/javascript">
+	// waiting spinner
+	var outerDiv = jQuery('body');
+	jQuery('<div id="loading"></div>')
+		.css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat")
+		.css("top", outerDiv.position().top - jQuery(window).scrollTop())
+		.css("left", outerDiv.position().left - jQuery(window).scrollLeft())
+		.css("width", outerDiv.width())
+		.css("height", outerDiv.height())
+		.css("position", "fixed")
+		.css("opacity", "0.80")
+		.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
+		.css("filter", "alpha(opacity = 80)")
+		.css("display", "none")
+		.appendTo(outerDiv);
+	jQuery('#loading').show();
+	// when page is ready remove and show
+	jQuery(window).load(function() {
+		jQuery('#componentbuilder_loader').fadeIn('fast');
+		jQuery('#loading').hide();
+	});
+</script>
+<div id="componentbuilder_loader" style="display: none;">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+
+	<?php echo JLayoutHelper::render('joomla_plugin_updates.updates_above', $this); ?>
+<div class="form-horizontal">
+
+	<?php echo JHtml::_('bootstrap.startTabSet', 'joomla_plugin_updatesTab', array('active' => 'updates')); ?>
+
+	<?php echo JHtml::_('bootstrap.addTab', 'joomla_plugin_updatesTab', 'updates', JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_UPDATES', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('joomla_plugin_updates.updates_fullwidth', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'joomla_plugin_updatesTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+	<?php if ($this->canDo->get('joomla_plugin_updates.delete') || $this->canDo->get('joomla_plugin_updates.edit.created_by') || $this->canDo->get('joomla_plugin_updates.edit.state') || $this->canDo->get('joomla_plugin_updates.edit.created')) : ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'joomla_plugin_updatesTab', 'publishing', JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_PUBLISHING', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla_plugin_updates.publishing', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla_plugin_updates.publlshing', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->canDo->get('core.admin')) : ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'joomla_plugin_updatesTab', 'permissions', JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_PERMISSION', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<fieldset class="adminform">
+					<div class="adminformlist">
+					<?php foreach ($this->form->getFieldset('accesscontrol') as $field): ?>
+						<div>
+							<?php echo $field->label; echo $field->input;?>
+						</div>
+						<div class="clearfix"></div>
+					<?php endforeach; ?>
+					</div>
+				</fieldset>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endif; ?>
+
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+	<div>
+		<input type="hidden" name="task" value="joomla_plugin_updates.edit" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
+</div>

admin/views/joomla_plugin_updates/tmpl/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/views/joomla_plugin_updates/view.html.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Joomla_plugin_updates View class
+ */
+class ComponentbuilderViewJoomla_plugin_updates extends JViewLegacy
+{
+	/**
+	 * display method of View
+	 * @return void
+	 */
+	public function display($tpl = null)
+	{
+		// set params
+		$this->params = JComponentHelper::getParams('com_componentbuilder');
+		// Assign the variables
+		$this->form = $this->get('Form');
+		$this->item = $this->get('Item');
+		$this->script = $this->get('Script');
+		$this->state = $this->get('State');
+		// get action permissions
+		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin_updates', $this->item);
+		// get input
+		$jinput = JFactory::getApplication()->input;
+		$this->ref = $jinput->get('ref', 0, 'word');
+		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
+		$this->referral = '';
+		if ($this->refid && $this->ref)
+		{
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
+		}
+		elseif($this->ref)
+		{
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
+		}
+
+		// Set the toolbar
+		$this->addToolBar();
+		
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display the template
+		parent::display($tpl);
+
+		// Set the document
+		$this->setDocument();
+	}
+
+
+	/**
+	 * Setting the toolbar
+	 */
+	protected function addToolBar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+		$user = JFactory::getUser();
+		$userId	= $user->id;
+		$isNew = $this->item->id == 0;
+
+		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_EDIT'), 'pencil-2 article-add');
+		// Built the actions for new and existing records.
+		if (ComponentbuilderHelper::checkString($this->referral))
+		{
+			if ($this->canDo->get('joomla_plugin_updates.create') && $isNew)
+			{
+				// We can create the record.
+				JToolBarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+			}
+			elseif ($this->canDo->get('joomla_plugin_updates.edit'))
+			{
+				// We can save the record.
+				JToolBarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+			}
+			if ($isNew)
+			{
+				// Do not creat but cancel.
+				JToolBarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				// We can close it.
+				JToolBarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		else
+		{
+			if ($isNew)
+			{
+				// For new records, check the create permission.
+				if ($this->canDo->get('joomla_plugin_updates.create'))
+				{
+					JToolBarHelper::apply('joomla_plugin_updates.apply', 'JTOOLBAR_APPLY');
+					JToolBarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+					JToolBarHelper::custom('joomla_plugin_updates.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+				};
+				JToolBarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CANCEL');
+			}
+			else
+			{
+				if ($this->canDo->get('joomla_plugin_updates.edit'))
+				{
+					// We can save the new record
+					JToolBarHelper::apply('joomla_plugin_updates.apply', 'JTOOLBAR_APPLY');
+					JToolBarHelper::save('joomla_plugin_updates.save', 'JTOOLBAR_SAVE');
+					// We can save this record, but check the create permission to see
+					// if we can return to make a new one.
+					if ($this->canDo->get('joomla_plugin_updates.create'))
+					{
+						JToolBarHelper::custom('joomla_plugin_updates.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+					}
+				}
+				$canVersion = ($this->canDo->get('core.version') && $this->canDo->get('joomla_plugin_updates.version'));
+				if ($this->state->params->get('save_history', 1) && $this->canDo->get('joomla_plugin_updates.edit') && $canVersion)
+				{
+					JToolbarHelper::versions('com_componentbuilder.joomla_plugin_updates', $this->item->id);
+				}
+				if ($this->canDo->get('joomla_plugin_updates.create'))
+				{
+					JToolBarHelper::custom('joomla_plugin_updates.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+				}
+				JToolBarHelper::cancel('joomla_plugin_updates.cancel', 'JTOOLBAR_CLOSE');
+			}
+		}
+		JToolbarHelper::divider();
+		// set help url for this view if found
+		$help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugin_updates');
+		if (ComponentbuilderHelper::checkString($help_url))
+		{
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+		}
+	}
+
+	/**
+	 * Escapes a value for output in a view script.
+	 *
+	 * @param   mixed  $var  The output to escape.
+	 *
+	 * @return  mixed  The escaped value.
+	 */
+	public function escape($var)
+	{
+		if(strlen($var) > 30)
+		{
+    		// use the helper htmlEscape method instead and shorten the string
+			return ComponentbuilderHelper::htmlEscape($var, $this->_charset, true, 30);
+		}
+		// use the helper htmlEscape method instead.
+		return ComponentbuilderHelper::htmlEscape($var, $this->_charset);
+	}
+
+	/**
+	 * Method to set up the document properties
+	 *
+	 * @return void
+	 */
+	protected function setDocument()
+	{
+		$isNew = ($this->item->id < 1);
+		if (!isset($this->document))
+		{
+			$this->document = JFactory::getDocument();
+		}
+		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_EDIT'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/joomla_plugin_updates.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/joomla_plugin_updates/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+		JText::script('view not acceptable. Error');
+	}
+}

admin/views/joomla_plugins/tmpl/default_body.php

@@ -69,7 +69,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $this->escape($item->system_name); ?>
-			<?php endif; ?>
+			<?php endif; ?> - <b>
+			<?php echo $this->escape($item->plugin_version); ?></b>
 			</div>
 			<?php
 				// setup the buttons
@@ -77,6 +78,11 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
 				{
 					$_buttons = array();
 					$_buttons[0] = array(
+						array(
+							'view' => 'joomla_plugin_updates',
+							'views' => 'joomla_plugins_updates',
+							'title' => JText::_('COM_COMPONENTBUILDER_THE_PLUGIN_UPDATES'),
+							'icon' => 'database'),
 						array(
 							'view' => 'joomla_plugin_files_folders_urls',
 							'views' => 'joomla_plugins_files_folders_urls',

admin/views/joomla_plugins_updates/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/views/joomla_plugins_updates/tmpl/default.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access'); 
+
+// load tooltip behavior
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('dropdown.init');
+JHtml::_('formbehavior.chosen', 'select');
+
+if ($this->saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_plugins_updates.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'joomla_plugin_updatesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
+}
+
+?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+    <div class="alert alert-no-items">
+        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+    </div>
+<?php else : ?>
+		<?php echo $this->loadTemplate('toolbar');?>
+		<table class="table table-striped" id="joomla_plugin_updatesList">
+			<thead><?php echo $this->loadTemplate('head');?></thead>
+			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+			<tbody><?php echo $this->loadTemplate('body');?></tbody>
+		</table>
+		<?php //Load the batch processing form. ?>
+        <?php if ($this->canCreate && $this->canEdit) : ?>
+            <?php echo JHtml::_(
+                'bootstrap.renderModal',
+                'collapseModal',
+                array(
+                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_OPTIONS'),
+                    'footer' => $this->loadTemplate('batch_footer')
+                ),
+                $this->loadTemplate('batch_body')
+            ); ?>
+        <?php endif; ?>
+		<input type="hidden" name="filter_order" value="" />
+		<input type="hidden" name="filter_order_Dir" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+<input type="hidden" name="task" value="" />
+<?php echo JHtml::_('form.token'); ?>
+</form>

admin/views/joomla_plugins_updates/tmpl/default_batch_body.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access'); 
+
+?>
+
+<p><?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_TIP'); ?></p>
+<?php echo $this->batchDisplay; ?>

admin/views/joomla_plugins_updates/tmpl/default_batch_footer.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access'); 
+
+?>
+<!-- clear the batch values if cancel -->
+<button class="btn" type="button" onclick="" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</button>
+<!-- post the batch values if process -->
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('joomla_plugin_updates.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>

admin/views/joomla_plugins_updates/tmpl/default_body.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access'); 
+
+$edit = "index.php?option=com_componentbuilder&view=joomla_plugins_updates&task=joomla_plugin_updates.edit";
+
+?>
+<?php foreach ($this->items as $i => $item): ?>
+	<?php
+		$canCheckin = $this->user->authorise('core.manage', 'com_checkin') || $item->checked_out == $this->user->id || $item->checked_out == 0;
+		$userChkOut = JFactory::getUser($item->checked_out);
+		$canDo = ComponentbuilderHelper::getActions('joomla_plugin_updates',$item,'joomla_plugins_updates');
+	?>
+	<tr class="row<?php echo $i % 2; ?>">
+		<td class="order nowrap center hidden-phone">
+		<?php if ($canDo->get('joomla_plugin_updates.edit.state')): ?>
+			<?php
+				if ($this->saveOrder)
+				{
+					$iconClass = ' inactive';
+				}
+				else
+				{
+					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
+				}
+			?>
+			<span class="sortable-handler<?php echo $iconClass; ?>">
+				<i class="icon-menu"></i>
+			</span>
+			<?php if ($this->saveOrder) : ?>
+				<input type="text" style="display:none" name="order[]" size="5"
+				value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+			<?php endif; ?>
+		<?php else: ?>
+			&#8942;
+		<?php endif; ?>
+		</td>
+		<td class="nowrap center">
+		<?php if ($canDo->get('joomla_plugin_updates.edit')): ?>
+				<?php if ($item->checked_out) : ?>
+					<?php if ($canCheckin) : ?>
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php else: ?>
+						&#9633;
+					<?php endif; ?>
+				<?php else: ?>
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				<?php endif; ?>
+		<?php else: ?>
+			&#9633;
+		<?php endif; ?>
+		</td>
+		<td class="nowrap">
+			<div class="name">
+				<?php if ($canDo->get('joomla_plugin_updates.edit')): ?>
+					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_plugin_system_name); ?></a>
+					<?php if ($item->checked_out): ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_plugins_updates.', $canCheckin); ?>
+					<?php endif; ?>
+				<?php else: ?>
+					<?php echo $this->escape($item->joomla_plugin_system_name); ?>
+				<?php endif; ?>
+			</div>
+		</td>
+		<td class="center">
+		<?php if ($canDo->get('joomla_plugin_updates.edit.state')) : ?>
+				<?php if ($item->checked_out) : ?>
+					<?php if ($canCheckin) : ?>
+						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_plugins_updates.', true, 'cb'); ?>
+					<?php else: ?>
+						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_plugins_updates.', false, 'cb'); ?>
+					<?php endif; ?>
+				<?php else: ?>
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_plugins_updates.', true, 'cb'); ?>
+				<?php endif; ?>
+		<?php else: ?>
+			<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_plugins_updates.', false, 'cb'); ?>
+		<?php endif; ?>
+		</td>
+		<td class="nowrap center hidden-phone">
+			<?php echo $item->id; ?>
+		</td>
+	</tr>
+<?php endforeach; ?>

admin/views/joomla_plugins_updates/tmpl/default_foot.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+?>
+<tr>
+	<td colspan="5"><?php echo $this->pagination->getListFooter(); ?></td>
+</tr>

admin/views/joomla_plugins_updates/tmpl/default_head.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+?>
+<tr>
+	<?php if ($this->canEdit&& $this->canState): ?>
+		<th width="1%" class="nowrap center hidden-phone">
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+		</th>
+		<th width="20" class="nowrap center">
+			<?php echo JHtml::_('grid.checkall'); ?>
+		</th>
+	<?php else: ?>
+		<th width="20" class="nowrap center hidden-phone">
+			&#9662;
+		</th>
+		<th width="20" class="nowrap center">
+			&#9632;
+		</th>
+	<?php endif; ?>
+	<th class="nowrap" >
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_JOOMLA_PLUGIN_LABEL'); ?>
+	</th>
+	<?php if ($this->canState): ?>
+		<th width="10" class="nowrap center" >
+			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_STATUS', 'published', $this->listDirn, $this->listOrder); ?>
+		</th>
+	<?php else: ?>
+		<th width="10" class="nowrap center" >
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_STATUS'); ?>
+		</th>
+	<?php endif; ?>
+	<th width="5" class="nowrap center hidden-phone" >
+			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_ID', 'id', $this->listDirn, $this->listOrder); ?>
+	</th>
+</tr>

admin/views/joomla_plugins_updates/tmpl/default_toolbar.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+?>
+<div id="filter-bar" class="btn-toolbar">
+        <div class="filter-search btn-group pull-left">
+            <label for="filter_search" class="element-invisible"><?php echo JText::_('Search');?></label>
+            <input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::tooltipText('Search Joomla_plugins_updates'); ?>" />
+        </div>
+        <div class="btn-group pull-left">
+            <button type="submit" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+            <button type="button" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
+        </div>
+        <div class="btn-group pull-right hidden-phone">
+            <label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
+            <?php echo $this->pagination->getLimitBox(); ?>
+        </div>
+        <div class="btn-group pull-right hidden-phone">
+            <label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
+            <select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
+                <option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
+                <option value="asc" <?php if ($this->listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
+                <option value="desc" <?php if ($this->listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
+            </select>
+        </div>
+        <div class="btn-group pull-right">
+            <label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
+            <select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
+                <option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
+                <?php echo JHtml::_('select.options', $this->getSortFields(), 'value', 'text', $this->listOrder);?>
+            </select>
+        </div>
+    </div>
+<div class="clearfix"> </div>

admin/views/joomla_plugins_updates/tmpl/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/views/joomla_plugins_updates/view.html.php

@@ -0,0 +1,226 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Componentbuilder View class for the Joomla_plugins_updates
+ */
+class ComponentbuilderViewJoomla_plugins_updates extends JViewLegacy
+{
+	/**
+	 * Joomla_plugins_updates view display method
+	 * @return void
+	 */
+	function display($tpl = null)
+	{
+		if ($this->getLayout() !== 'modal')
+		{
+			// Include helper submenu
+			ComponentbuilderHelper::addSubmenu('joomla_plugins_updates');
+		}
+
+		// Assign data to the view
+		$this->items = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->state = $this->get('State');
+		$this->user = JFactory::getUser();
+		$this->listOrder = $this->escape($this->state->get('list.ordering'));
+		$this->listDirn = $this->escape($this->state->get('list.direction'));
+		$this->saveOrder = $this->listOrder == 'ordering';
+		// set the return here value
+		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
+		// get global action permissions
+		$this->canDo = ComponentbuilderHelper::getActions('joomla_plugin_updates');
+		$this->canEdit = $this->canDo->get('joomla_plugin_updates.edit');
+		$this->canState = $this->canDo->get('joomla_plugin_updates.edit.state');
+		$this->canCreate = $this->canDo->get('joomla_plugin_updates.create');
+		$this->canDelete = $this->canDo->get('joomla_plugin_updates.delete');
+		$this->canBatch = $this->canDo->get('core.batch');
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+			// load the batch html
+			if ($this->canCreate && $this->canEdit && $this->canState)
+			{
+				$this->batchDisplay = JHtmlBatch_::render();
+			}
+		}
+		
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display the template
+		parent::display($tpl);
+
+		// Set the document
+		$this->setDocument();
+	}
+
+	/**
+	 * Setting the toolbar
+	 */
+	protected function addToolBar()
+	{
+		JToolBarHelper::title(JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES'), 'joomla');
+		JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=joomla_plugins_updates');
+		JFormHelper::addFieldPath(JPATH_COMPONENT . '/models/fields');
+
+		if ($this->canCreate)
+		{
+			JToolBarHelper::addNew('joomla_plugin_updates.add');
+		}
+
+		// Only load if there are items
+		if (ComponentbuilderHelper::checkArray($this->items))
+		{
+			if ($this->canEdit)
+			{
+				JToolBarHelper::editList('joomla_plugin_updates.edit');
+			}
+
+			if ($this->canState)
+			{
+				JToolBarHelper::publishList('joomla_plugins_updates.publish');
+				JToolBarHelper::unpublishList('joomla_plugins_updates.unpublish');
+				JToolBarHelper::archiveList('joomla_plugins_updates.archive');
+
+				if ($this->canDo->get('core.admin'))
+				{
+					JToolBarHelper::checkin('joomla_plugins_updates.checkin');
+				}
+			}
+
+			// Add a batch button
+			if ($this->canBatch && $this->canCreate && $this->canEdit && $this->canState)
+			{
+				// Get the toolbar object instance
+				$bar = JToolBar::getInstance('toolbar');
+				// set the batch button name
+				$title = JText::_('JTOOLBAR_BATCH');
+				// Instantiate a new JLayoutFile instance and render the batch button
+				$layout = new JLayoutFile('joomla.toolbar.batch');
+				// add the button to the page
+				$dhtml = $layout->render(array('title' => $title));
+				$bar->appendButton('Custom', $dhtml, 'batch');
+			}
+
+			if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete))
+			{
+				JToolbarHelper::deleteList('', 'joomla_plugins_updates.delete', 'JTOOLBAR_EMPTY_TRASH');
+			}
+			elseif ($this->canState && $this->canDelete)
+			{
+				JToolbarHelper::trash('joomla_plugins_updates.trash');
+			}
+		}
+
+		// set help url for this view if found
+		$help_url = ComponentbuilderHelper::getHelpUrl('joomla_plugins_updates');
+		if (ComponentbuilderHelper::checkString($help_url))
+		{
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+		}
+
+		// add the options comp button
+		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
+		{
+			JToolBarHelper::preferences('com_componentbuilder');
+		}
+
+		if ($this->canState)
+		{
+			JHtmlSidebar::addFilter(
+				JText::_('JOPTION_SELECT_PUBLISHED'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true)
+			);
+			// only load if batch allowed
+			if ($this->canBatch)
+			{
+				JHtmlBatch_::addListSelection(
+					JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE'),
+					'batch[published]',
+					JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('all' => false)), 'value', 'text', '', true)
+				);
+			}
+		}
+
+		JHtmlSidebar::addFilter(
+			JText::_('JOPTION_SELECT_ACCESS'),
+			'filter_access',
+			JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'))
+		);
+
+		if ($this->canBatch && $this->canCreate && $this->canEdit)
+		{
+			JHtmlBatch_::addListSelection(
+				JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS'),
+				'batch[access]',
+				JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')
+			);
+		}
+	}
+
+	/**
+	 * Method to set up the document properties
+	 *
+	 * @return void
+	 */
+	protected function setDocument()
+	{
+		if (!isset($this->document))
+		{
+			$this->document = JFactory::getDocument();
+		}
+		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/joomla_plugins_updates.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+	}
+
+	/**
+	 * Escapes a value for output in a view script.
+	 *
+	 * @param   mixed  $var  The output to escape.
+	 *
+	 * @return  mixed  The escaped value.
+	 */
+	public function escape($var)
+	{
+		if(strlen($var) > 50)
+		{
+			// use the helper htmlEscape method instead and shorten the string
+			return ComponentbuilderHelper::htmlEscape($var, $this->_charset, true);
+		}
+		// use the helper htmlEscape method instead.
+		return ComponentbuilderHelper::htmlEscape($var, $this->_charset);
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.sorting' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.published' => JText::_('JSTATUS'),
+			'a.id' => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}

admin/views/layout/tmpl/edit.php

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

admin/views/library/tmpl/edit.php

@@ -146,21 +146,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwbk function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwbk = jQuery("#jform_how").val();
-	vvvvwbk(how_vvvvwbk);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwbk = jQuery("#jform_how").val();
-	vvvvwbk(how_vvvvwbk);
-
-});
-
 // #jform_how listeners for how_vvvvwbl function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -251,18 +236,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwbr function
+// #jform_how listeners for how_vvvvwbr function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwbr = jQuery("#jform_how").val();
+	vvvvwbr(how_vvvvwbr);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbr = jQuery("#jform_how").val();
+	vvvvwbr(how_vvvvwbr);
+
+});
+
+// #jform_type listeners for type_vvvvwbs function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwbr = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwbr(type_vvvvwbr);
+	vvvvwbs(type_vvvvwbs);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbr = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwbr(type_vvvvwbr);
+	vvvvwbs(type_vvvvwbs);
 
 });
 

admin/views/server/tmpl/edit.php

@@ -125,21 +125,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwco function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwco = jQuery("#jform_protocol").val();
-	vvvvwco(protocol_vvvvwco);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwco = jQuery("#jform_protocol").val();
-	vvvvwco(protocol_vvvvwco);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwcp function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -159,135 +144,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcq = jQuery("#jform_authentication").val();
+	vvvvwcq(protocol_vvvvwcq);
-	vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcq = jQuery("#jform_authentication").val();
+	vvvvwcq(protocol_vvvvwcq);
-	vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcq function
+// #jform_protocol listeners for protocol_vvvvwcr function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcq = jQuery("#jform_authentication").val();
-	vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcq = jQuery("#jform_authentication").val();
-	vvvvwcq(protocol_vvvvwcq,authentication_vvvvwcq);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwcs function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs);
+	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs);
+	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcs function
+// #jform_authentication listeners for authentication_vvvvwcr function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs);
+	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcs = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcs(protocol_vvvvwcs,authentication_vvvvwcs);
+	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcu function
+// #jform_protocol listeners for protocol_vvvvwct function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcu function
+// #jform_authentication listeners for authentication_vvvvwct function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcw function
+// #jform_protocol listeners for protocol_vvvvwcv function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcw function
+// #jform_authentication listeners for authentication_vvvvwcv function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwcx function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
+	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
+	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwcx function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
+	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
+	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
 
 });
 

admin/views/site_view/tmpl/edit.php

@@ -166,168 +166,168 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzq function
+// #jform_add_php_view listeners for add_php_view_vvvvvzr function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzq(add_php_view_vvvvvzq);
+	vvvvvzr(add_php_view_vvvvvzr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvzr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzq(add_php_view_vvvvvzq);
+	vvvvvzr(add_php_view_vvvvvzr);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvzr function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvzs function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvzr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzs = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzr(add_php_jview_display_vvvvvzr);
+	vvvvvzs(add_php_jview_display_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvzr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvzs = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvzr(add_php_jview_display_vvvvvzr);
+	vvvvvzs(add_php_jview_display_vvvvvzs);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvzs function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvzt function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvzs = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzs(add_php_jview_vvvvvzs);
+	vvvvvzt(add_php_jview_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvzs = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvzt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvzs(add_php_jview_vvvvvzs);
+	vvvvvzt(add_php_jview_vvvvvzt);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvzt function
+// #jform_add_php_document listeners for add_php_document_vvvvvzu function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvzt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzt(add_php_document_vvvvvzt);
+	vvvvvzu(add_php_document_vvvvvzu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvzt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvzu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvzt(add_php_document_vvvvvzt);
+	vvvvvzu(add_php_document_vvvvvzu);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvzu function
+// #jform_add_css_document listeners for add_css_document_vvvvvzv function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvzu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzu(add_css_document_vvvvvzu);
+	vvvvvzv(add_css_document_vvvvvzv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvzu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvzv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvzu(add_css_document_vvvvvzu);
+	vvvvvzv(add_css_document_vvvvvzv);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvzv function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvzw function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvzv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzv(add_javascript_file_vvvvvzv);
+	vvvvvzw(add_javascript_file_vvvvvzw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvzv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvzw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvzv(add_javascript_file_vvvvvzv);
+	vvvvvzw(add_javascript_file_vvvvvzw);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvzw function
+// #jform_add_js_document listeners for add_js_document_vvvvvzx function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvzw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzw(add_js_document_vvvvvzw);
+	vvvvvzx(add_js_document_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvzw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvzx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvzw(add_js_document_vvvvvzw);
+	vvvvvzx(add_js_document_vvvvvzx);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvzx function
+// #jform_add_css listeners for add_css_vvvvvzy function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvzx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzx(add_css_vvvvvzx);
+	vvvvvzy(add_css_vvvvvzy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvzx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvzy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvzx(add_css_vvvvvzx);
+	vvvvvzy(add_css_vvvvvzy);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzy function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzz function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvzy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzy(add_php_ajax_vvvvvzy);
+	vvvvvzz(add_php_ajax_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvzy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvzz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvzy(add_php_ajax_vvvvvzy);
+	vvvvvzz(add_php_ajax_vvvvvzz);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvzz function
+// #jform_add_custom_button listeners for add_custom_button_vvvvwaa function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvzz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvwaa = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzz(add_custom_button_vvvvvzz);
+	vvvvwaa(add_custom_button_vvvvwaa);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvzz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvwaa = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzz(add_custom_button_vvvvvzz);
+	vvvvwaa(add_custom_button_vvvvwaa);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvwaa function
+// #jform_button_position listeners for button_position_vvvvwab function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvwaa = jQuery("#jform_button_position").val();
+	var button_position_vvvvwab = jQuery("#jform_button_position").val();
-	vvvvwaa(button_position_vvvvwaa);
+	vvvvwab(button_position_vvvvwab);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvwaa = jQuery("#jform_button_position").val();
+	var button_position_vvvvwab = jQuery("#jform_button_position").val();
-	vvvvwaa(button_position_vvvvwaa);
+	vvvvwab(button_position_vvvvwab);
 
 });
 

admin/views/template/tmpl/edit.php

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

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>4th August, 2019</creationDate>
+	<creationDate>8th August, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.35</version>
+	<version>2.9.36</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.35)</h1>
+		<h1>Component Builder (v.2.9.36)</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.
 
@@ -39,8 +39,6 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
 		<folder>js</folder>
 		<folder>css</folder>
 		<folder>images</folder>
-		<folder>uikit-v2</folder>
-		<folder>footable-v3</folder>
 	</media>
 
 	<!-- Update Schema; New in Joomla 2.5 -->
@@ -55,9 +53,7 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
 		<filename>index.html</filename>
 		<filename>router.php</filename>
 		<filename>componentbuilder.php</filename>
-		<filename>componentbuilder.php</filename>
 		<filename>router.php</filename>
-		<filename>controller.php</filename>
 		<folder>assets</folder>
 		<folder>helpers</folder>
 		<folder>controllers</folder>
@@ -100,11 +96,6 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
 			<filename>controller.php</filename>
 			<filename>index.html</filename>
 			<filename>componentbuilder.php</filename>
-			<filename>access.xml</filename>
-			<filename>config.xml</filename>
-			<filename>controller.php</filename>
-			<filename>componentbuilder.php</filename>
-			<filename>README.txt</filename>
 			<filename>README.txt</filename>
 			<folder>assets</folder>
 			<folder>controllers</folder>
@@ -114,8 +105,6 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
 			<folder>tables</folder>
 			<folder>views</folder>
 			<folder>layouts</folder>
-			<folder>custom</folder>
-			<folder>compiler</folder>
 		</files>
 
 		<languages folder="admin">

componentbuilder_update_server.xml

@@ -721,7 +721,7 @@
 		<version>2.9.31</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.35/JCB_v2.9.35.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -738,7 +738,7 @@
 		<version>2.9.32</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.35/JCB_v2.9.35.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -755,7 +755,7 @@
 		<version>2.9.33</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.35/JCB_v2.9.35.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -772,7 +772,7 @@
 		<version>2.9.34</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.35/JCB_v2.9.35.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -789,7 +789,24 @@
 		<version>2.9.35</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.35/JCB_v2.9.35.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.9.36</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.36/JCB_v2.9.36.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

script.php

@@ -20,21 +20,27 @@ JHTML::_('behavior.modal');
 class com_componentbuilderInstallerScript
 {
 	/**
-	 * method to install the component
+	 * Constructor
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
 	 */
-	function install($parent)
+	public function __construct(JAdapterInstance $parent) {}
-	{
-
-	}
 
 	/**
-	 * method to uninstall the component
+	 * Called on installation
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function uninstall($parent)
+	public function install(JAdapterInstance $parent) {}
+
+	/**
+	 * Called on uninstallation
+	 *
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 */
+	public function uninstall(JAdapterInstance $parent)
 	{
 		// Get Application object
 		$app = JFactory::getApplication();
@@ -3740,6 +3746,92 @@ class com_componentbuilderInstallerScript
 			}
 		}
 
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		// Select id from content type table
+		$query->select($db->quoteName('type_id'));
+		$query->from($db->quoteName('#__content_types'));
+		// Where Joomla_plugin_updates alias is found
+		$query->where( $db->quoteName('type_alias') . ' = '. $db->quote('com_componentbuilder.joomla_plugin_updates') );
+		$db->setQuery($query);
+		// Execute query to see if alias is found
+		$db->execute();
+		$joomla_plugin_updates_found = $db->getNumRows();
+		// Now check if there were any rows
+		if ($joomla_plugin_updates_found)
+		{
+			// Since there are load the needed  joomla_plugin_updates type ids
+			$joomla_plugin_updates_ids = $db->loadColumn();
+			// Remove Joomla_plugin_updates from the content type table
+			$joomla_plugin_updates_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_componentbuilder.joomla_plugin_updates') );
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->delete($db->quoteName('#__content_types'));
+			$query->where($joomla_plugin_updates_condition);
+			$db->setQuery($query);
+			// Execute the query to remove Joomla_plugin_updates items
+			$joomla_plugin_updates_done = $db->execute();
+			if ($joomla_plugin_updates_done)
+			{
+				// If succesfully remove Joomla_plugin_updates add queued success message.
+				$app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the <b>#__content_type</b> table'));
+			}
+
+			// Remove Joomla_plugin_updates items from the contentitem tag map table
+			$joomla_plugin_updates_condition = array( $db->quoteName('type_alias') . ' = '. $db->quote('com_componentbuilder.joomla_plugin_updates') );
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->delete($db->quoteName('#__contentitem_tag_map'));
+			$query->where($joomla_plugin_updates_condition);
+			$db->setQuery($query);
+			// Execute the query to remove Joomla_plugin_updates items
+			$joomla_plugin_updates_done = $db->execute();
+			if ($joomla_plugin_updates_done)
+			{
+				// If succesfully remove Joomla_plugin_updates add queued success message.
+				$app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the <b>#__contentitem_tag_map</b> table'));
+			}
+
+			// Remove Joomla_plugin_updates items from the ucm content table
+			$joomla_plugin_updates_condition = array( $db->quoteName('core_type_alias') . ' = ' . $db->quote('com_componentbuilder.joomla_plugin_updates') );
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->delete($db->quoteName('#__ucm_content'));
+			$query->where($joomla_plugin_updates_condition);
+			$db->setQuery($query);
+			// Execute the query to remove Joomla_plugin_updates items
+			$joomla_plugin_updates_done = $db->execute();
+			if ($joomla_plugin_updates_done)
+			{
+				// If succesfully remove Joomla_plugin_updates add queued success message.
+				$app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the <b>#__ucm_content</b> table'));
+			}
+
+			// Make sure that all the Joomla_plugin_updates items are cleared from DB
+			foreach ($joomla_plugin_updates_ids as $joomla_plugin_updates_id)
+			{
+				// Remove Joomla_plugin_updates items from the ucm base table
+				$joomla_plugin_updates_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $joomla_plugin_updates_id);
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				$query->delete($db->quoteName('#__ucm_base'));
+				$query->where($joomla_plugin_updates_condition);
+				$db->setQuery($query);
+				// Execute the query to remove Joomla_plugin_updates items
+				$db->execute();
+
+				// Remove Joomla_plugin_updates items from the ucm history table
+				$joomla_plugin_updates_condition = array( $db->quoteName('ucm_type_id') . ' = ' . $joomla_plugin_updates_id);
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				$query->delete($db->quoteName('#__ucm_history'));
+				$query->where($joomla_plugin_updates_condition);
+				$db->setQuery($query);
+				// Execute the query to remove Joomla_plugin_updates items
+				$db->execute();
+			}
+		}
+
 		// Create a new query object.
 		$query = $db->getQuery(true);
 		// Select id from content type table
@@ -3854,38 +3946,40 @@ class com_componentbuilderInstallerScript
 	}
 
 	/**
-	 * method to update the component
+	 * Called on update
 	 *
-	 * @return void
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function update($parent)
+	public function update(JAdapterInstance $parent){}
-	{
-		
-	}
 
 	/**
-	 * method to run before an install/update/uninstall method
+	 * Called before any type of action
 	 *
-	 * @return void
+	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function preflight($type, $parent)
+	public function preflight($type, JAdapterInstance $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();
-		// is redundant ...hmmm
+		// is redundant or so it seems ...hmmm let me know if it works again
-		if ($type == 'uninstall')
+		if ($type === 'uninstall')
 		{
 			return true;
 		}
 		// the default for both install and update
 		$jversion = new JVersion();
-		if (!$jversion->isCompatible('3.6.0'))
+		if (!$jversion->isCompatible('3.8.0'))
 		{
-			$app->enqueueMessage('Please upgrade to at least Joomla! 3.6.0 before continuing!', 'error');
+			$app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');
 			return false;
 		}
 		// do any updates needed
-		if ($type == 'update')
+		if ($type === 'update')
 		{
 			// load the helper class
 			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
@@ -4254,24 +4348,28 @@ class com_componentbuilderInstallerScript
 			}
 		}
 		// do any install needed
-		if ($type == 'install')
+		if ($type === 'install')
 		{
 		}
+		return true;
 	}
 
 	/**
-	 * method to run after an install/update/uninstall method
+	 * Called after any type of action
 	 *
-	 * @return void
+	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
 	 */
-	function postflight($type, $parent)
+	public function postflight($type, JAdapterInstance $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();
 		// We check if we have dynamic folders to copy
 		$this->setDynamicF0ld3rs($app, $parent);
 		// set the default component settings
-		if ($type == 'install')
+		if ($type === 'install')
 		{
 
 			// Get The Database object
@@ -4294,9 +4392,9 @@ class com_componentbuilderInstallerScript
 			$joomla_plugin->type_title = 'Componentbuilder Joomla_plugin';
 			$joomla_plugin->type_alias = 'com_componentbuilder.joomla_plugin';
 			$joomla_plugin->table = '{"special": {"dbtable": "#__componentbuilder_joomla_plugin","key": "id","type": "Joomla_plugin","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_plugin->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_method_uninstall","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","class_extends":"class_extends","joomla_plugin_group":"joomla_plugin_group","sql_uninstall":"sql_uninstall","sql":"sql","php_method_uninstall":"php_method_uninstall","php_postflight_update":"php_postflight_update","php_postflight_install":"php_postflight_install","add_sales_server":"add_sales_server","add_head":"add_head","readme":"readme","update_server_url":"update_server_url","head":"head","main_class_code":"main_class_code","name":"name","add_php_postflight_update":"add_php_postflight_update","not_required":"not_required","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_php_preflight_install":"add_php_preflight_install","add_sql_uninstall":"add_sql_uninstall","php_preflight_install":"php_preflight_install","addreadme":"addreadme","add_php_preflight_update":"add_php_preflight_update","add_update_server":"add_update_server","php_preflight_update":"php_preflight_update","update_server_target":"update_server_target","add_php_preflight_uninstall":"add_php_preflight_uninstall","php_preflight_uninstall":"php_preflight_uninstall","update_server":"update_server","add_php_postflight_install":"add_php_postflight_install","sales_server":"sales_server"}}';
+			$joomla_plugin->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_method_uninstall","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","class_extends":"class_extends","joomla_plugin_group":"joomla_plugin_group","sql":"sql","php_method_uninstall":"php_method_uninstall","php_postflight_update":"php_postflight_update","php_postflight_install":"php_postflight_install","description":"description","update_server_url":"update_server_url","head":"head","add_head":"add_head","sql_uninstall":"sql_uninstall","readme":"readme","main_class_code":"main_class_code","add_sales_server":"add_sales_server","not_required":"not_required","add_php_postflight_install":"add_php_postflight_install","plugin_version":"plugin_version","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_php_script_construct":"add_php_script_construct","add_sql":"add_sql","php_script_construct":"php_script_construct","add_sql_uninstall":"add_sql_uninstall","add_php_preflight_install":"add_php_preflight_install","addreadme":"addreadme","php_preflight_install":"php_preflight_install","add_update_server":"add_update_server","add_php_preflight_update":"add_php_preflight_update","update_server_target":"update_server_target","php_preflight_update":"php_preflight_update","add_php_preflight_uninstall":"add_php_preflight_uninstall","update_server":"update_server","php_preflight_uninstall":"php_preflight_uninstall","sales_server":"sales_server","name":"name"}}';
 			$joomla_plugin->router = 'ComponentbuilderHelperRoute::getJoomla_pluginRoute';
-			$joomla_plugin->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin.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","class_extends","joomla_plugin_group","add_sales_server","add_head","add_php_postflight_update","add_php_method_uninstall","add_sql","add_php_preflight_install","add_sql_uninstall","addreadme","add_php_preflight_update","add_update_server","update_server_target","add_php_preflight_uninstall","update_server","add_php_postflight_install","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": "class_extends","targetTable": "#__componentbuilder_class_extends","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "joomla_plugin_group","targetTable": "#__componentbuilder_joomla_plugin_group","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_plugin->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin.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","class_extends","joomla_plugin_group","add_head","add_sales_server","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_php_script_construct","add_sql","add_sql_uninstall","add_php_preflight_install","addreadme","add_update_server","add_php_preflight_update","update_server_target","add_php_preflight_uninstall","update_server","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": "class_extends","targetTable": "#__componentbuilder_class_extends","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "joomla_plugin_group","targetTable": "#__componentbuilder_joomla_plugin_group","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$joomla_plugin_Inserted = $db->insertObject('#__content_types', $joomla_plugin);
@@ -4793,6 +4891,18 @@ class com_componentbuilderInstallerScript
 			// Set the object into the content types table.
 			$joomla_plugin_group_Inserted = $db->insertObject('#__content_types', $joomla_plugin_group);
 
+			// Create the joomla_plugin_updates content type object.
+			$joomla_plugin_updates = new stdClass();
+			$joomla_plugin_updates->type_title = 'Componentbuilder Joomla_plugin_updates';
+			$joomla_plugin_updates->type_alias = 'com_componentbuilder.joomla_plugin_updates';
+			$joomla_plugin_updates->table = '{"special": {"dbtable": "#__componentbuilder_joomla_plugin_updates","key": "id","type": "Joomla_plugin_updates","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
+			$joomla_plugin_updates->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "joomla_plugin","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"joomla_plugin":"joomla_plugin"}}';
+			$joomla_plugin_updates->router = 'ComponentbuilderHelperRoute::getJoomla_plugin_updatesRoute';
+			$joomla_plugin_updates->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin_updates.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","joomla_plugin"],"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": "joomla_plugin","targetTable": "#__componentbuilder_joomla_plugin","targetColumn": "id","displayColumn": "system_name"}]}';
+
+			// Set the object into the content types table.
+			$joomla_plugin_updates_Inserted = $db->insertObject('#__content_types', $joomla_plugin_updates);
+
 			// Create the joomla_plugin_files_folders_urls content type object.
 			$joomla_plugin_files_folders_urls = new stdClass();
 			$joomla_plugin_files_folders_urls->type_title = 'Componentbuilder Joomla_plugin_files_folders_urls';
@@ -4825,7 +4935,7 @@ class com_componentbuilderInstallerScript
 				</a>';
 		}
 		// do any updates needed
-		if ($type == 'update')
+		if ($type === 'update')
 		{
 
 			// Get The Database object
@@ -4865,9 +4975,9 @@ class com_componentbuilderInstallerScript
 			$joomla_plugin->type_title = 'Componentbuilder Joomla_plugin';
 			$joomla_plugin->type_alias = 'com_componentbuilder.joomla_plugin';
 			$joomla_plugin->table = '{"special": {"dbtable": "#__componentbuilder_joomla_plugin","key": "id","type": "Joomla_plugin","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_plugin->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_method_uninstall","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","class_extends":"class_extends","joomla_plugin_group":"joomla_plugin_group","sql_uninstall":"sql_uninstall","sql":"sql","php_method_uninstall":"php_method_uninstall","php_postflight_update":"php_postflight_update","php_postflight_install":"php_postflight_install","add_sales_server":"add_sales_server","add_head":"add_head","readme":"readme","update_server_url":"update_server_url","head":"head","main_class_code":"main_class_code","name":"name","add_php_postflight_update":"add_php_postflight_update","not_required":"not_required","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_php_preflight_install":"add_php_preflight_install","add_sql_uninstall":"add_sql_uninstall","php_preflight_install":"php_preflight_install","addreadme":"addreadme","add_php_preflight_update":"add_php_preflight_update","add_update_server":"add_update_server","php_preflight_update":"php_preflight_update","update_server_target":"update_server_target","add_php_preflight_uninstall":"add_php_preflight_uninstall","php_preflight_uninstall":"php_preflight_uninstall","update_server":"update_server","add_php_postflight_install":"add_php_postflight_install","sales_server":"sales_server"}}';
+			$joomla_plugin->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_method_uninstall","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","class_extends":"class_extends","joomla_plugin_group":"joomla_plugin_group","sql":"sql","php_method_uninstall":"php_method_uninstall","php_postflight_update":"php_postflight_update","php_postflight_install":"php_postflight_install","description":"description","update_server_url":"update_server_url","head":"head","add_head":"add_head","sql_uninstall":"sql_uninstall","readme":"readme","main_class_code":"main_class_code","add_sales_server":"add_sales_server","not_required":"not_required","add_php_postflight_install":"add_php_postflight_install","plugin_version":"plugin_version","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_php_script_construct":"add_php_script_construct","add_sql":"add_sql","php_script_construct":"php_script_construct","add_sql_uninstall":"add_sql_uninstall","add_php_preflight_install":"add_php_preflight_install","addreadme":"addreadme","php_preflight_install":"php_preflight_install","add_update_server":"add_update_server","add_php_preflight_update":"add_php_preflight_update","update_server_target":"update_server_target","php_preflight_update":"php_preflight_update","add_php_preflight_uninstall":"add_php_preflight_uninstall","update_server":"update_server","php_preflight_uninstall":"php_preflight_uninstall","sales_server":"sales_server","name":"name"}}';
 			$joomla_plugin->router = 'ComponentbuilderHelperRoute::getJoomla_pluginRoute';
-			$joomla_plugin->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin.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","class_extends","joomla_plugin_group","add_sales_server","add_head","add_php_postflight_update","add_php_method_uninstall","add_sql","add_php_preflight_install","add_sql_uninstall","addreadme","add_php_preflight_update","add_update_server","update_server_target","add_php_preflight_uninstall","update_server","add_php_postflight_install","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": "class_extends","targetTable": "#__componentbuilder_class_extends","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "joomla_plugin_group","targetTable": "#__componentbuilder_joomla_plugin_group","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_plugin->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin.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","class_extends","joomla_plugin_group","add_head","add_sales_server","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_php_script_construct","add_sql","add_sql_uninstall","add_php_preflight_install","addreadme","add_update_server","add_php_preflight_update","update_server_target","add_php_preflight_uninstall","update_server","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": "class_extends","targetTable": "#__componentbuilder_class_extends","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "joomla_plugin_group","targetTable": "#__componentbuilder_joomla_plugin_group","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if joomla_plugin type is already in content_type DB.
 			$joomla_plugin_id = null;
@@ -6078,6 +6188,35 @@ class com_componentbuilderInstallerScript
 				$joomla_plugin_group_Inserted = $db->insertObject('#__content_types', $joomla_plugin_group);
 			}
 
+			// Create the joomla_plugin_updates content type object.
+			$joomla_plugin_updates = new stdClass();
+			$joomla_plugin_updates->type_title = 'Componentbuilder Joomla_plugin_updates';
+			$joomla_plugin_updates->type_alias = 'com_componentbuilder.joomla_plugin_updates';
+			$joomla_plugin_updates->table = '{"special": {"dbtable": "#__componentbuilder_joomla_plugin_updates","key": "id","type": "Joomla_plugin_updates","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
+			$joomla_plugin_updates->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "joomla_plugin","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"joomla_plugin":"joomla_plugin"}}';
+			$joomla_plugin_updates->router = 'ComponentbuilderHelperRoute::getJoomla_plugin_updatesRoute';
+			$joomla_plugin_updates->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_plugin_updates.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","joomla_plugin"],"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": "joomla_plugin","targetTable": "#__componentbuilder_joomla_plugin","targetColumn": "id","displayColumn": "system_name"}]}';
+
+			// Check if joomla_plugin_updates type is already in content_type DB.
+			$joomla_plugin_updates_id = null;
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName(array('type_id')));
+			$query->from($db->quoteName('#__content_types'));
+			$query->where($db->quoteName('type_alias') . ' LIKE '. $db->quote($joomla_plugin_updates->type_alias));
+			$db->setQuery($query);
+			$db->execute();
+
+			// Set the object into the content types table.
+			if ($db->getNumRows())
+			{
+				$joomla_plugin_updates->type_id = $db->loadResult();
+				$joomla_plugin_updates_Updated = $db->updateObject('#__content_types', $joomla_plugin_updates, 'type_id');
+			}
+			else
+			{
+				$joomla_plugin_updates_Inserted = $db->insertObject('#__content_types', $joomla_plugin_updates);
+			}
+
 			// Create the joomla_plugin_files_folders_urls content type object.
 			$joomla_plugin_files_folders_urls = new stdClass();
 			$joomla_plugin_files_folders_urls->type_title = 'Componentbuilder Joomla_plugin_files_folders_urls';
@@ -6315,8 +6454,9 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.9.35 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.36 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
+		return true;
 	}
 
 	/**
@@ -6333,7 +6473,7 @@ class com_componentbuilderInstallerScript
 		$folders = JFolder::folders($installPath);
 		// check if we have folders we may want to copy
 		$doNotCopy = array('media','admin','site'); // Joomla already deals with these
-		if (count($folders) > 1)
+		if (count((array) $folders) > 1)
 		{
 			foreach ($folders as $folder)
 			{