Moved the phpseclib files to their own folder in libraries. Improved the composer autoloader in JCB. Improved the phpseclib class implementation. Added a new Expert Mode to field modeling under the database tab in the field area.

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.10.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.4) 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,13 +146,13 @@ 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*: 14th October, 2019
++ *Last Build*: 16th October, 2019
-+ *Version*: 2.10.1
++ *Version*: 2.10.4
 + *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*: **253791**
++ *Line count*: **255312**
-+ *Field count*: **1347**
++ *Field count*: **1353**
-+ *File count*: **1618**
++ *File count*: **1620**
 + *Folder count*: **261**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.10.4) 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,13 +146,13 @@ 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*: 14th October, 2019
++ *Last Build*: 16th October, 2019
-+ *Version*: 2.10.1
++ *Version*: 2.10.4
 + *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*: **253791**
++ *Line count*: **255312**
-+ *Field count*: **1347**
++ *Field count*: **1353**
-+ *File count*: **1618**
++ *File count*: **1620**
 + *Folder count*: **261**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/helpers/compiler/a_Get.php

@@ -638,7 +638,7 @@ class Get
 	 * 
 	 * @var    array
 	 */
-	public $cryptionTypes = array('basic', 'medium', 'whmcs');
+	public $cryptionTypes = array('basic', 'medium', 'whmcs', 'expert');
 
 	/**
 	 * The WHMCS Encryption Switch
@@ -2586,7 +2586,7 @@ class Get
 			{
 				if (!isset($this->libManager[$this->target][$view->code][$library]))
 				{
-					if ($this->getLibrary((int) $library))
+					if ($this->getMediaLibrary((int) $library))
 					{
 						$this->libManager[$this->target][$view->code][(int) $library] = true;
 					}
@@ -2595,7 +2595,7 @@ class Get
 		}
 		elseif (is_numeric($view->libraries) && !isset($this->libManager[$this->target][$view->code][(int) $view->libraries]))
 		{
-			if ($this->getLibrary((int) $view->libraries))
+			if ($this->getMediaLibrary((int) $view->libraries))
 			{
 				$this->libManager[$this->target][$view->code][(int) $view->libraries] = true;
 			}
@@ -2922,6 +2922,28 @@ class Get
 				{
 					$this->mediumEncryption = true;
 				}
+				// check if we have better encryption
+				elseif (6 == $field->store
+					&& ComponentbuilderHelper::checkString($field->on_get_model_field)
+					&& ComponentbuilderHelper::checkString($field->on_save_model_field))
+				{
+					// add only if string lenght found
+					if (ComponentbuilderHelper::checkString($field->initiator_on_save_model))
+					{
+						$field->initiator_save_key = md5($field->initiator_on_save_model);
+						$field->initiator_save = explode(PHP_EOL, $this->setPlaceholders($this->setDynamicValues(base64_decode($field->initiator_on_save_model)), $this->placeholders));
+					}
+					if (ComponentbuilderHelper::checkString($field->initiator_on_save_model))
+					{
+						$field->initiator_get_key = md5($field->initiator_on_get_model);
+						$field->initiator_get = explode(PHP_EOL, $this->setPlaceholders($this->setDynamicValues(base64_decode($field->initiator_on_get_model)), $this->placeholders));
+					}
+					// set the field modeling
+					$field->model_field['save'] = explode(PHP_EOL, $this->setPlaceholders($this->setDynamicValues(base64_decode($field->on_save_model_field)), $this->placeholders));
+					$field->model_field['get'] = explode(PHP_EOL, $this->setPlaceholders($this->setDynamicValues(base64_decode($field->on_get_model_field)), $this->placeholders));
+					// remove the original values
+					unset($field->on_save_model_field, $field->on_get_model_field, $field->initiator_on_save_model, $field->initiator_on_get_model);
+				}
 
 				// get the last used version
 				$field->history = $this->getHistoryWatch('field', $id);
@@ -4400,7 +4422,7 @@ class Get
 					{
 						if (!isset($this->libManager[$this->target][$view][$library]))
 						{
-							if ($this->getLibrary((int) $library))
+							if ($this->getMediaLibrary((int) $library))
 							{
 								$this->libManager[$this->target][$view][(int) $library] = true;
 							}
@@ -4409,7 +4431,7 @@ class Get
 				}
 				elseif (is_numeric($row->libraries) && !isset($this->libManager[$this->target][$view][(int) $row->libraries]))
 				{
-					if ($this->getLibrary((int) $row->libraries))
+					if ($this->getMediaLibrary((int) $row->libraries))
 					{
 						$this->libManager[$this->target][$view][(int) $row->libraries] = true;
 					}
@@ -4488,14 +4510,14 @@ class Get
 	}
 
 	/**
-	 * Get Library Data and store globaly
+	 * Get Media Library Data and store globally
 	 * 
 	 * @param   string   $id the library id
 	 *
 	 * @return  bool    true on success
 	 * 
 	 */
-	protected function getLibrary($id)
+	protected function getMediaLibrary($id)
 	{
 
 		// check if the lib has already been set
@@ -4579,6 +4601,7 @@ class Get
 			$query->join('LEFT', $this->db->quoteName('#__componentbuilder_library_config', 'b') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('b.library') . ')');
 			$query->join('LEFT', $this->db->quoteName('#__componentbuilder_library_files_folders_urls', 'c') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('c.library') . ')');
 			$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
+			$query->where($this->db->quoteName('a.target') . ' = 1');
 
 			// Reset the query using our newly populated query object.
 			$this->db->setQuery($query);

admin/helpers/compiler/c_Fields.php

@@ -243,25 +243,39 @@ class Fields extends Structure
 	public $base64Builder = array();
 
 	/**
-	 * Basic Encryption Builder
+	 * Basic Encryption Field Modeling
 	 *
 	 * @var    array
 	 */
-	public $basicEncryptionBuilder = array();
+	public $basicFieldModeling = array();
 
 	/**
-	 * WHMCS Encryption Builder
+	 * WHMCS Encryption Field Modeling
 	 *
 	 * @var    array
 	 */
-	public $whmcsEncryptionBuilder = array();
+	public $whmcsFieldModeling = array();
 
 	/**
-	 * Medium Encryption Builder
+	 * Medium Encryption Field Modeling
 	 *
 	 * @var    array
 	 */
-	public $mediumEncryptionBuilder = array();
+	public $mediumFieldModeling = array();
+
+	/**
+	 * Expert Field Modeling
+	 *
+	 * @var    array
+	 */
+	public $expertFieldModeling = array();
+
+	/**
+	 * Expert Mode Initiator
+	 *
+	 * @var    array
+	 */
+	public $expertFieldModelInitiator = array();
 
 	/**
 	 * Get Items Method List String Fix Builder
@@ -2320,7 +2334,7 @@ class Fields extends Structure
 	 */
 	public function buildSiteFieldData($view, $field, $set, $type)
 	{
-		$decode = array('json', 'base64', 'basic_encryption', 'whmcs_encryption', 'medium_encryption');
+		$decode = array('json', 'base64', 'basic_encryption', 'whmcs_encryption', 'medium_encryption', 'expert_mode');
 		$textareas = array('textarea', 'editor');
 		if (isset($this->siteFields[$view][$field]) && ComponentbuilderHelper::checkArray($this->siteFields[$view][$field]))
 		{
@@ -2988,22 +3002,41 @@ class Fields extends Structure
 					break;
 				case 3:
 					// BASIC_ENCRYPTION_LOCALKEY
-					$this->basicEncryptionBuilder[$view_name_single][] = $name;
+					$this->basicFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'basic_encryption', $typeName);
 					break;
 				case 4:
 					// WHMCS_ENCRYPTION_VDMKEY
-					$this->whmcsEncryptionBuilder[$view_name_single][] = $name;
+					$this->whmcsFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'whmcs_encryption', $typeName);
 					break;
 				case 5:
 					// MEDIUM_ENCRYPTION_LOCALFILE
-					$this->mediumEncryptionBuilder[$view_name_single][] = $name;
+					$this->mediumFieldModeling[$view_name_single][] = $name;
 					// Site settings of each field if needed
 					$this->buildSiteFieldData($view_name_single, $name, 'medium_encryption', $typeName);
 					break;
+				case 6:
+					// EXPERT_MODE
+					if(isset($field['settings']->model_field))
+					{
+						if (isset($field['settings']->initiator_save_key))
+						{
+							$this->expertFieldModelInitiator[$view_name_single]['save'][$field['settings']->initiator_save_key]
+								= $field['settings']->initiator_save;
+						}
+						if (isset($field['settings']->initiator_get_key))
+						{
+							$this->expertFieldModelInitiator[$view_name_single]['get'][$field['settings']->initiator_get_key]
+								= $field['settings']->initiator_get;
+						}
+						$this->expertFieldModeling[$view_name_single][$name] = $field['settings']->model_field;
+						// Site settings of each field if needed
+						$this->buildSiteFieldData($view_name_single, $name, 'expert_mode', $typeName);
+					}
+					break;
 				default:
 					// JSON_ARRAY_ENCODE
 					$this->jsonItemBuilder[$view_name_single][] = $name;

admin/helpers/compiler/e_Interpretation.php

@@ -635,12 +635,12 @@ class Interpretation extends Fields
 		// WHMCS_ENCRYPT_FILE
 		$this->fileContentStatic[$this->hhh . 'WHMCS_ENCRYPT_FILE' . $this->hhh] = '';
 		// check if encryption is ative
-		if ((isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder)) ||
+		if ((isset($this->basicFieldModeling) && ComponentbuilderHelper::checkArray($this->basicFieldModeling)) ||
-			(isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder)) ||
+			(isset($this->mediumFieldModeling) && ComponentbuilderHelper::checkArray($this->mediumFieldModeling)) ||
-			(isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder)) ||
+			(isset($this->whmcsFieldModeling) && ComponentbuilderHelper::checkArray($this->whmcsFieldModeling)) ||
 			$this->componentData->add_license)
 		{
-			if (isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder) || $this->componentData->add_license)
+			if (isset($this->whmcsFieldModeling) && ComponentbuilderHelper::checkArray($this->whmcsFieldModeling) || $this->componentData->add_license)
 			{
 				// set whmcs encrypt file into place
 				$target = array('admin' => 'whmcs');
@@ -669,7 +669,7 @@ class Interpretation extends Fields
 			$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
 			$function[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $component . "', true);";
 			// add the basic option
-			if (isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder))
+			if (isset($this->basicFieldModeling) && ComponentbuilderHelper::checkArray($this->basicFieldModeling))
 			{
 				$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Basic Encryption Type";
 				$function[] = $this->_t(2) . "if ('basic' === \$type)";
@@ -682,7 +682,7 @@ class Interpretation extends Fields
 				$function[] = $this->_t(2) . "}";
 			}
 			// add the medium option
-			if (isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder))
+			if (isset($this->mediumFieldModeling) && ComponentbuilderHelper::checkArray($this->mediumFieldModeling))
 			{
 				$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Medium Encryption Type";
 				$function[] = $this->_t(2) . "if ('medium' === \$type)";
@@ -705,7 +705,7 @@ class Interpretation extends Fields
 				$function[] = $this->_t(2) . "}";
 			}
 			// add the whmcs option
-			if (isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder) || $this->componentData->add_license)
+			if (isset($this->whmcsFieldModeling) && ComponentbuilderHelper::checkArray($this->whmcsFieldModeling) || $this->componentData->add_license)
 			{
 				$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " WHMCS Encryption Type";
 				$function[] = $this->_t(2) . "if ('whmcs' === \$type || 'advanced' === \$type)";
@@ -724,7 +724,7 @@ class Interpretation extends Fields
 			$function[] = PHP_EOL . $this->_t(2) . "return \$default;";
 			$function[] = $this->_t(1) . "}";
 			// set the getMediumCryptKey class/method
-			if (isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder))
+			if (isset($this->mediumFieldModeling) && ComponentbuilderHelper::checkArray($this->mediumFieldModeling))
 			{
 				$function[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**";
 				$function[] = $this->_t(1) . " *	The Medium Encryption Key";
@@ -1821,6 +1821,8 @@ class Interpretation extends Fields
 				// now loop the array
 				foreach ($array['decode'] as $decode)
 				{
+					$if = '';
+					$decoder = '';
 					if ('json' === $decode)
 					{
 						$if = PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "if (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkJson(" . $string . "->" . $field . "))" . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
@@ -1839,17 +1841,33 @@ class Interpretation extends Fields
 						{
 							if ($cryptionType . '_encryption' === $decode)
 							{
-								$if = PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "if (!empty(" . $string . "->" . $field . ") && \$" . $cryptionType . "key && !is_numeric(" . $string . "->" . $field . ") && " . $string . "->" . $field . " === base64_encode(base64_decode(" . $string . "->" . $field . ", true)))" . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
+								if ('expert' !== $cryptionType)
-								// set decryption
+								{
-								$decoder = $string . "->" . $field . " = rtrim(\$" . $cryptionType . "->decryptString(" . $string . "->" . $field . "), " . '"\0"' . ");";
+									$if = PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "if (!empty(" . $string . "->" . $field . ") && \$" . $cryptionType . "key && !is_numeric(" . $string . "->" . $field . ") && " . $string . "->" . $field . " === base64_encode(base64_decode(" . $string . "->" . $field . ", true)))" . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
+									// set decryption
+									$decoder = $string . "->" . $field . " = rtrim(\$" . $cryptionType . "->decryptString(" . $string . "->" . $field . "), " . '"\0"' . ");";
+								}
+								elseif (isset($this->{$cryptionType . 'FieldModeling'}[$code][$field]))
+								{
+									$_placeholder_for_field = array('[[[field]]]' => $string . "->" . $field);
+									$fieldDecode .= $this->setPlaceholders(PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . implode(PHP_EOL . $this->_t(1) . $tab . $this->_t(1), $this->{$cryptionType . 'FieldModeling'}[$code][$field]['get']), $_placeholder_for_field);
+								}
+								// activate site decryption
 								$this->siteDecrypt[$cryptionType][$code] = true;
 							}
 						}
 					}
-
+					// check if we have found the details
-					// build decoder string
+					if (ComponentbuilderHelper::checkString($if))
-					$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Check if we can decode " . $field .$if . PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Decode " . $field;
+					{
-					$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . $decoder . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
+						// build decoder string
+						$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Check if we can decode " . $field .$if . PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Decode " . $field;
+					}
+					if (ComponentbuilderHelper::checkString($decoder))
+					{
+						// build decoder string
+						$fieldDecode .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . $decoder . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
+					}
 				}
 			}
 		}
@@ -2495,10 +2513,21 @@ class Interpretation extends Fields
 			{
 				if (isset($this->siteDecrypt[$cryptionType][$code]) && $this->siteDecrypt[$cryptionType][$code])
 				{
-					$script .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
+					if ('expert' !== $cryptionType)
-					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+					{
-					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+						$script .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
-					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+						$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+						$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+						$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+					}
+					elseif (isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]) 
+						&& isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get']))
+					{
+						foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get'] as $block)
+						{
+							$script .= PHP_EOL . $this->_t(1) . implode(PHP_EOL . $this->_t(1), $block);
+						}
+					}
 				}
 			}
 			$getItem = $script . $getItem;
@@ -2993,10 +3022,21 @@ class Interpretation extends Fields
 						{
 							if (isset($this->siteDecrypt[$cryptionType][$code]) && $this->siteDecrypt[$cryptionType][$code])
 							{
-								$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
+								if ('expert' !== $cryptionType)
-								$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+								{
-								$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+									$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
-								$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);" . PHP_EOL;
+									$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+									$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+									$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);" . PHP_EOL;
+								}
+								elseif (isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]) 
+									&& isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get']))
+								{
+									foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get'] as $block)
+									{
+										$script .= PHP_EOL . $this->_t(2) . implode(PHP_EOL . $this->_t(2), $block);
+									}
+								}
 							}
 						}
 						$methods = str_replace($this->hhh . 'CRYPT' . $this->hhh, $script, $methods);
@@ -3250,10 +3290,21 @@ class Interpretation extends Fields
 		{
 			if ($this->siteDecrypt[$cryptionType][$code])
 			{
-				$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
+				if ('expert' !== $cryptionType)
-				$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+				{
-				$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+					$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
-				$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+					$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+					$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+					$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+				}
+				elseif (isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]) 
+					&& isset($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get']))
+				{
+					foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$code]['get'] as $block)
+					{
+						$script .= PHP_EOL . $this->_t(2) . implode(PHP_EOL . $this->_t(2), $block);
+					}
+				}
 			}
 		}
 		return $script . $getItem;
@@ -4574,19 +4625,38 @@ class Interpretation extends Fields
 		// decryption
 		foreach ($this->cryptionTypes as $cryptionType)
 		{
-			if (isset($this->{$cryptionType . 'EncryptionBuilder'}[$view]) && ComponentbuilderHelper::checkArray($this->{$cryptionType . 'EncryptionBuilder'}[$view]))
+			if (isset($this->{$cryptionType . 'FieldModeling'}[$view]) && ComponentbuilderHelper::checkArray($this->{$cryptionType . 'FieldModeling'}[$view]))
 			{
-				$script .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
+				if ('expert' !== $cryptionType)
-				$script .= PHP_EOL . $this->_t(3) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
-				$script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
-				$script .= PHP_EOL . $this->_t(3) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
-				foreach ($this->{$cryptionType . 'EncryptionBuilder'}[$view] as $baseString)
 				{
-					$script .= PHP_EOL . PHP_EOL . $this->_t(3) . "if (!empty(\$item->" . $baseString . ") && \$" . $cryptionType . "key && !is_numeric(\$item->" . $baseString . ") && \$item->" . $baseString . " === base64_encode(base64_decode(\$item->" . $baseString . ", true)))";
+					$script .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption.";
-					$script .= PHP_EOL . $this->_t(3) . "{";
+					$script .= PHP_EOL . $this->_t(3) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
-					$script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__) . " " . $cryptionType . " decrypt data " . $baseString . ".";
+					$script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
-					$script .= PHP_EOL . $this->_t(4) . "\$item->" . $baseString . " = rtrim(\$" . $cryptionType . "->decryptString(\$item->" . $baseString . "), " . '"\0"' . ");";
+					$script .= PHP_EOL . $this->_t(3) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
-					$script .= PHP_EOL . $this->_t(3) . "}";
+					foreach ($this->{$cryptionType . 'FieldModeling'}[$view] as $baseString)
+					{
+						$script .= PHP_EOL . PHP_EOL . $this->_t(3) . "if (!empty(\$item->" . $baseString . ") && \$" . $cryptionType . "key && !is_numeric(\$item->" . $baseString . ") && \$item->" . $baseString . " === base64_encode(base64_decode(\$item->" . $baseString . ", true)))";
+						$script .= PHP_EOL . $this->_t(3) . "{";
+						$script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__) . " " . $cryptionType . " decrypt data " . $baseString . ".";
+						$script .= PHP_EOL . $this->_t(4) . "\$item->" . $baseString . " = rtrim(\$" . $cryptionType . "->decryptString(\$item->" . $baseString . "), " . '"\0"' . ");";
+						$script .= PHP_EOL . $this->_t(3) . "}";
+					}
+				}
+				else
+				{
+					if (isset($this->{$cryptionType . 'FieldModelInitiator'}[$view]['get']))
+					{
+						foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$view]['get'] as $block)
+						{
+							$script .= PHP_EOL . $this->_t(3) . implode(PHP_EOL . $this->_t(3), $block);
+						}
+					}
+					// set the expert script
+					foreach ($this->{$cryptionType . 'FieldModeling'}[$view] as $baseString => $opener_)
+					{
+						$_placeholder_for_field = array('[[[field]]]' => '$item->' . $baseString);
+						$script .= $this->setPlaceholders(PHP_EOL . $this->_t(3) . implode(PHP_EOL . $this->_t(3), $opener_['get']), $_placeholder_for_field);
+					}
 				}
 			}
 		}
@@ -4718,19 +4788,39 @@ class Interpretation extends Fields
 		// turn string into encrypted string
 		foreach ($this->cryptionTypes as $cryptionType)
 		{
-			if (isset($this->{$cryptionType . 'EncryptionBuilder'}[$view]) && ComponentbuilderHelper::checkArray($this->{$cryptionType . 'EncryptionBuilder'}[$view]))
+			if (isset($this->{$cryptionType . 'FieldModeling'}[$view]) && ComponentbuilderHelper::checkArray($this->{$cryptionType . 'FieldModeling'}[$view]))
 			{
-				$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption key.";
+				if ('expert' !== $cryptionType)
-				$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
-				$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object";
-				$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
-				foreach ($this->{$cryptionType . 'EncryptionBuilder'}[$view] as $baseString)
 				{
-					$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Encrypt data " . $baseString . ".";
+					$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption key.";
-					$script .= PHP_EOL . $this->_t(2) . "if (isset(\$data['" . $baseString . "']) && \$" . $cryptionType . "key)";
+					$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
-					$script .= PHP_EOL . $this->_t(2) . "{";
+					$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the encryption object";
-					$script .= PHP_EOL . $this->_t(3) . "\$data['" . $baseString . "'] = \$" . $cryptionType . "->encryptString(\$data['" . $baseString . "']);";
+					$script .= PHP_EOL . $this->_t(2) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
-					$script .= PHP_EOL . $this->_t(2) . "}";
+					foreach ($this->{$cryptionType . 'FieldModeling'}[$view] as $baseString)
+					{
+						$script .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Encrypt data " . $baseString . ".";
+						$script .= PHP_EOL . $this->_t(2) . "if (isset(\$data['" . $baseString . "']) && \$" . $cryptionType . "key)";
+						$script .= PHP_EOL . $this->_t(2) . "{";
+						$script .= PHP_EOL . $this->_t(3) . "\$data['" . $baseString . "'] = \$" . $cryptionType . "->encryptString(\$data['" . $baseString . "']);";
+						$script .= PHP_EOL . $this->_t(2) . "}";
+					}
+				}
+				else
+				{
+					if (isset($this->{$cryptionType . 'FieldModelInitiator'}[$view]) && 
+						isset($this->{$cryptionType . 'FieldModelInitiator'}[$view]['save']))
+					{
+						foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$view]['save'] as $block)
+						{
+							$script .= PHP_EOL . $this->_t(2) . implode(PHP_EOL . $this->_t(2), $block);
+						}
+					}
+					// set the expert script
+					foreach ($this->{$cryptionType . 'FieldModeling'}[$view] as $baseString => $locker_)
+					{
+						$_placeholder_for_field = array('[[[field]]]' => "\$data['" . $baseString . "']");
+						$script .= $this->setPlaceholders(PHP_EOL . $this->_t(2) . implode(PHP_EOL . $this->_t(2), $locker_['save']), $_placeholder_for_field);
+					}
 				}
 			}
 		}
@@ -12863,6 +12953,12 @@ class Interpretation extends Fields
 						$mediumCrypt = true;
 						$suffix_decode = '';
 						break;
+					case 6:
+						// EXPERT_ENCRYPTION
+						$decode = '///////////////////////////////////////////';
+						$expertCrypt = true;
+						$suffix_decode = '';
+						break;
 					default:
 						// JSON_ARRAY_ENCODE
 						$decode = 'json_decode';
@@ -13142,10 +13238,21 @@ class Interpretation extends Fields
 		{
 			if (${$cryptionType . 'Crypt'})
 			{
-				$script .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption key.";
+				if ('expert' !== $cryptionType)
-				$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+				{
-				$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+					$script .= PHP_EOL . PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the " . $cryptionType . " encryption key.";
-				$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . "key = " . $Component . "Helper::getCryptKey('" . $cryptionType . "');";
+					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Get the encryption object.";
+					$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$" . $cryptionType . " = new FOFEncryptAes(\$" . $cryptionType . "key);";
+				}
+				elseif (isset($this->{$cryptionType . 'FieldModelInitiator'}[$viewName_single]) 
+					&& isset($this->{$cryptionType . 'FieldModelInitiator'}[$viewName_single]['get']))
+				{
+					foreach ($this->{$cryptionType . 'FieldModelInitiator'}[$viewName_single]['get'] as $block)
+					{
+						$script .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . implode(PHP_EOL . $this->_t(1) . $tab . $this->_t(1), $block);
+					}
+				}
 			}
 		}
 		// add the encryption script

admin/helpers/compiler/f_Infusion.php

@@ -224,7 +224,6 @@ class Infusion extends Interpretation
 					$this->fileContentStatic[$globalPlaceholder] = $gloabalValue;
 				}
 			}
-
 			// reset view array
 			$viewarray = array();
 			$site_edit_view_array = array();
@@ -313,7 +312,6 @@ class Infusion extends Interpretation
 					{
 						$this->fileContentDynamic[$viewName_single][$this->hhh . 'DOCUMENT_CUSTOM_PHP' . $this->hhh] = '';
 					}
-
 					// LINKEDVIEWTABLESCRIPTS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh] = '';
 
@@ -606,7 +604,6 @@ class Infusion extends Interpretation
 				}
 				// HELPER_EXEL
 				$this->fileContentStatic[$this->hhh . 'HELPER_EXEL' . $this->hhh] = $this->setExelHelperMethods();
-
 				// Trigger Event: jcb_ce_onAfterBuildAdminViewContent
 				$this->triggerEvent('jcb_ce_onAfterBuildAdminViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 			}

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

@@ -3798,8 +3798,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST="List"
@@ -4800,6 +4800,7 @@ COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_DESCRIPTION="Text Area"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT="Value/Example Here"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL="Value/Example"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE="Error! Please add value/example here."
+COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM="Expert Mode - Custom"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDS="Fields"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES="Fieldtypes Categories"
 COM_COMPONENTBUILDER_FIELDTYPE_FIFTY="50"
@@ -4865,8 +4866,8 @@ COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE="Error! Please add some
 COM_COMPONENTBUILDER_FIELDTYPE_SIXTY_FOUR="64"
 COM_COMPONENTBUILDER_FIELDTYPE_STATUS="Status"
 COM_COMPONENTBUILDER_FIELDTYPE_STORE="Store"
-COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION="How should the data be stored."
+COM_COMPONENTBUILDER_FIELDTYPE_STORE_DESCRIPTION="How should the field value be modeled during saving and getting of the value. <b>Default</b> is the Joomla basic normal storing way of dealing with this field type."
-COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL="Store Method"
+COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL="Field Modeling Method<br /><small>Store Method</small>"
 COM_COMPONENTBUILDER_FIELDTYPE_TEN="10"
 COM_COMPONENTBUILDER_FIELDTYPE_TEXT="TEXT"
 COM_COMPONENTBUILDER_FIELDTYPE_TIME="TIME"
@@ -4938,6 +4939,7 @@ COM_COMPONENTBUILDER_FIELD_DOUBLE="DOUBLE"
 COM_COMPONENTBUILDER_FIELD_EDIT="Editing the Field"
 COM_COMPONENTBUILDER_FIELD_ELEVEN="11"
 COM_COMPONENTBUILDER_FIELD_ERROR_UNIQUE_ALIAS="Another Field has the same alias."
+COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM="Expert Mode - Custom"
 COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES="Fields Categories"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE="Fieldtype"
 COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION="Set the field type"
@@ -4948,6 +4950,20 @@ COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL="Field Information"
 COM_COMPONENTBUILDER_FIELD_ID="Id"
 COM_COMPONENTBUILDER_FIELD_INDEXES="Indexes"
 COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL="Indexes Type"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL="Initiator On Get Model"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_DESCRIPTION="The initiator to on get model this field. If JCB finds that there is more then one field with the same initiator code in one view it will only load it once. You could also leave this blank if you already have the on get model initiator set in another field of the same admin_view."
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT="// Get the medium decryption.
+$mediumkey = &#91;&#91;&#91;Component&#93;&#93;&#93;Helper::getCryptKey('medium');
+// Get the encryption object.
+$medium = new FOFEncryptAes($mediumkey);"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_LABEL="Initiator<br /><small>on get model</small>"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL="Initiator On Save Model"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION="The initiator to on save model this field. If JCB finds that there is more then one field with the same initiator code in one view it will only load it once. You could also leave this blank if you already have the on save model initiator set in another field of the same admin_view."
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT="// Get the medium encryption.
+$mediumkey = &#91;&#91;&#91;Component&#93;&#93;&#93;Helper::getCryptKey('medium');
+// Get the encryption object.
+$medium = new FOFEncryptAes($mediumkey);"
+COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL="Initiator<br /><small>on save model</small>"
 COM_COMPONENTBUILDER_FIELD_INT="INT"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER="Javascript Views Footer"
 COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION="Add JavaScript for the list view that is loaded in the footer inside script tags. Do not add the script tags."
@@ -4977,6 +4993,9 @@ COM_COMPONENTBUILDER_FIELD_NONE="None"
 COM_COMPONENTBUILDER_FIELD_NONE_SET="None Set"
 COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION="<p>Set the database column for this field here. The column will have the same name as the field. Please take care to select these settings in the correct relationship. The nature of this area is to give you as much freedom/power as you would like, but with that comes responsibility.</p><p>You therefore need to insure that you know what the correct values should be. A great way to learn, is to look at the Joomla core components fields and the corresponding mySql columns.</p>"
 COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL="Database Settings"
+COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION="<p>When using the EXPERT mode you need to be that expert.</p>
+<p>Bellow you must add the required code to <b>on save model</b> and <b>on get model</b> the set value. Usually if we start modeling values, we first load the needed classes, so for that purpose you have the <b>initiator</b> input areas.</p>"
+COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL="The Expert Mode"
 COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<div class='form-horizontal'>
 	<div class='span4'>
 	<h1>Filter Information</h1>
@@ -5080,6 +5099,18 @@ COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL="Null Switch"
 COM_COMPONENTBUILDER_FIELD_ONE="1"
 COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED="100"
 COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR="1024"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD="On Get Model Field"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION="To on get model the field value"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT="if (!empty([[[field]]]) && $mediumkey && !is_numeric([[[field]]]) && [[[field]]] === base64_encode(base64_decode([[[field]]], true)))
+{
+		// medium decrypt field
+		[[[field]]] = rtrim($medium->decryptString([[[field]]]), &quot;\0&quot;);
+}"
+COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL="On Get Model"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD="On Save Model Field"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_DESCRIPTION="To on save model the field value"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_HINT="[[[field]]] = $medium->encryptString([[[field]]]);"
+COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL="On Save Model"
 COM_COMPONENTBUILDER_FIELD_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_FIELD_OTHER="Other"
 COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
@@ -5094,8 +5125,8 @@ COM_COMPONENTBUILDER_FIELD_SEVEN="7"
 COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR="64"
 COM_COMPONENTBUILDER_FIELD_STATUS="Status"
 COM_COMPONENTBUILDER_FIELD_STORE="Store"
-COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION="How should the data be stored."
+COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION="How should the field value be modeled during saving and getting of the value. <b>Default</b> is the Joomla basic normal storing way of dealing with this field type."
-COM_COMPONENTBUILDER_FIELD_STORE_LABEL="Store Method"
+COM_COMPONENTBUILDER_FIELD_STORE_LABEL="Field Modeling Method<br /><small>Store Method</small>"
 COM_COMPONENTBUILDER_FIELD_TEN="10"
 COM_COMPONENTBUILDER_FIELD_TEXT="TEXT"
 COM_COMPONENTBUILDER_FIELD_TIME="TIME"
@@ -6632,8 +6663,8 @@ COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION="Add the layout code here."
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout<br /><small>$displayData is the Object that is used inside the layout file to build displayed output</small>"
 COM_COMPONENTBUILDER_LAYOUT_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
+COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
-COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC="The last user that modified this Layout."
 COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC="The date this Layout was modified."
@@ -6985,10 +7016,11 @@ COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="
 COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-sensitive (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION="Select the libraries you want to bundle here."
-COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_LIBRARY_LINKED="Linked"
 COM_COMPONENTBUILDER_LIBRARY_MAIN="Main"
 COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
+COM_COMPONENTBUILDER_LIBRARY_MEDIA="Media"
 COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_DESC="The last user that modified this Library."
 COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_LABEL="Modified By"
@@ -7037,13 +7069,16 @@ COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL="PHP - setDocument()"
 COM_COMPONENTBUILDER_LIBRARY_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_LIBRARY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Library to customise the alias."
 COM_COMPONENTBUILDER_LIBRARY_STATUS="Status"
+COM_COMPONENTBUILDER_LIBRARY_TARGET="Target"
 COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_DESCRIPTION="Select the target behavior."
 COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_LABEL="Target Behavior"
+COM_COMPONENTBUILDER_LIBRARY_TARGET_DESCRIPTION="Select what target folder this library belongs to. <b>Media</b> is used mostly for CSS and JavaScript type libraries, and <b>Libraries</b> are for PHP libraries."
+COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL="Target Folder"
 COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_DESCRIPTION="Select the target file/s relation to other of the same target file/s."
 COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_LABEL="Target Relation"
 COM_COMPONENTBUILDER_LIBRARY_TYPE="Type"
-COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION="Select what type of library this should be."
+COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION="Select what type of library behavior this should be."
-COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL="Type Behavior"
 COM_COMPONENTBUILDER_LIBRARY_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_VERSION_DESC="A count of the number of times this Library has been revised."
 COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL="Revision"
@@ -7105,6 +7140,7 @@ COM_COMPONENTBUILDER_NO_S_FOUND="No %s Found"
 COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE="No %s have been linked to this view. Soon as this is done it will be displayed here."
 COM_COMPONENTBUILDER_NO_TYPE="No Type"
 COM_COMPONENTBUILDER_NO_VALIDATION_RULES_FOUND="No validation rules found."
+COM_COMPONENTBUILDER_NO_VALID_MODE_HAS_BEEN_SPECIFIED="No valid mode has been specified!"
 COM_COMPONENTBUILDER_OFFICIAL_VDM_PACKAGES="Official VDM Packages"
 COM_COMPONENTBUILDER_ONLY_IN_ADMIN_LIST_VIEW="Only in Admin List View"
 COM_COMPONENTBUILDER_ONLY_IN_LINKED_LIST_VIEWS="Only in Linked List Views"
@@ -7706,8 +7742,8 @@ COM_COMPONENTBUILDER_SITE_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_SITE_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_SITE_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
+COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
-COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_SITE_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_SITE_VIEW_LIST="List"
@@ -8222,8 +8258,8 @@ COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES="Libraries"
-COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
+COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the media libraries you want to use here."
-COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL="Media Libraries"
 COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC="The last user that modified this Template."
 COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC="The date this Template was modified."
@@ -8284,7 +8320,7 @@ COM_COMPONENTBUILDER_THE_BONLY_IN_LINKED_LIST_VIEWSB_OPTION_WILL_ONLY_ADD_THIS_F
 COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>phpseclib\NET\SFTP</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info"
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_PATH_ON_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> path on <b>%s</b> server."
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> server."
-COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info!"
+COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESPHPSECLIBVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/phpseclib/vendor</b> folder. Please contact your system administrator for more info!"
 COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK="The <b>%s</b> library can not be deleted, or things will break."
 COM_COMPONENTBUILDER_THE_BSHOW_IN_ALL_LIST_VIEWSB_OPTION_WILL_ADD_THIS_FIELD_TO_ALL_LIST_VIEWS_ADMIN_AMP_LINKED="The <b>Show in All List Views</b> option will Add this field to all list views, admin &amp; linked."
 COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS="The component admin views"

admin/layouts/field/database_right.php

@@ -29,7 +29,12 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'indexes',
 	'null_switch',
 	'store',
-	'note_whmcs_encryption'
+	'note_whmcs_encryption',
+	'note_expert_field_save_mode',
+	'initiator_on_save_model',
+	'initiator_on_get_model',
+	'on_save_model_field',
+	'on_get_model_field'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/fieldtype/fields_fullwidth.php

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

admin/layouts/library/behaviour_above.php

@@ -27,6 +27,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
+	'target',
 	'how',
 	'type'
 );

admin/layouts/server/linked_components_fullwidth.php

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

admin/models/ajax.php

@@ -2365,7 +2365,7 @@ class ComponentbuilderModelAjax extends JModelList
 		),
 		// #__componentbuilder_field (i)
 		'field' => array(
-			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer'),
+			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer', 'on_save_model_field', 'on_get_model_field', 'initiator_on_save_model', 'initiator_on_get_model'),
 			'views' => 'fields',
 			'not_base64' => array('xml' => 'json'),
 			'base64_search' => array('xml' => array('start' => 'type_php', '_start' => '="', 'end' => '"')),

admin/models/field.php

@@ -51,7 +51,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				'indexes',
 				'null_switch',
 				'store',
-				'note_whmcs_encryption'
+				'note_whmcs_encryption',
+				'note_expert_field_save_mode',
+				'initiator_on_save_model',
+				'initiator_on_get_model',
+				'on_save_model_field',
+				'on_get_model_field'
 			),
 			'fullwidth' => array(
 				'note_no_database_settings_needed',
@@ -154,10 +159,22 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->css_views))
+			if (!empty($item->on_get_model_field))
 			{
-				// base64 Decode css_views.
+				// base64 Decode on_get_model_field.
-				$item->css_views = base64_decode($item->css_views);
+				$item->on_get_model_field = base64_decode($item->on_get_model_field);
+			}
+
+			if (!empty($item->on_save_model_field))
+			{
+				// base64 Decode on_save_model_field.
+				$item->on_save_model_field = base64_decode($item->on_save_model_field);
+			}
+
+			if (!empty($item->initiator_on_get_model))
+			{
+				// base64 Decode initiator_on_get_model.
+				$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 			}
 
 			if (!empty($item->css_view))
@@ -166,6 +183,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->css_view = base64_decode($item->css_view);
 			}
 
+			if (!empty($item->css_views))
+			{
+				// base64 Decode css_views.
+				$item->css_views = base64_decode($item->css_views);
+			}
+
 			if (!empty($item->javascript_view_footer))
 			{
 				// base64 Decode javascript_view_footer.
@@ -178,6 +201,12 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->initiator_on_save_model))
+			{
+				// base64 Decode initiator_on_save_model.
+				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+			}
+
 			if (!empty($item->xml))
 			{
 				// JSON Decode xml.
@@ -1067,10 +1096,22 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['xml'] = (string) json_encode($data['xml']);
 		}
 
-		// Set the css_views string to base64 string.
+		// Set the on_get_model_field string to base64 string.
-		if (isset($data['css_views']))
+		if (isset($data['on_get_model_field']))
 		{
-			$data['css_views'] = base64_encode($data['css_views']);
+			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
+		}
+
+		// Set the on_save_model_field string to base64 string.
+		if (isset($data['on_save_model_field']))
+		{
+			$data['on_save_model_field'] = base64_encode($data['on_save_model_field']);
+		}
+
+		// Set the initiator_on_get_model string to base64 string.
+		if (isset($data['initiator_on_get_model']))
+		{
+			$data['initiator_on_get_model'] = base64_encode($data['initiator_on_get_model']);
 		}
 
 		// Set the css_view string to base64 string.
@@ -1079,6 +1120,12 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['css_view'] = base64_encode($data['css_view']);
 		}
 
+		// Set the css_views string to base64 string.
+		if (isset($data['css_views']))
+		{
+			$data['css_views'] = base64_encode($data['css_views']);
+		}
+
 		// Set the javascript_view_footer string to base64 string.
 		if (isset($data['javascript_view_footer']))
 		{
@@ -1091,6 +1138,12 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the initiator_on_save_model string to base64 string.
+		if (isset($data['initiator_on_save_model']))
+		{
+			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
+		}
+        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/fields.php

@@ -233,7 +233,8 @@ class ComponentbuilderModelFields extends JModelList
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
 				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
 				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
+				6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
@@ -428,14 +429,22 @@ class ComponentbuilderModelFields extends JModelList
 							continue;
 						}
 
-						// decode css_views
+						// decode on_get_model_field
-						$item->css_views = base64_decode($item->css_views);
+						$item->on_get_model_field = base64_decode($item->on_get_model_field);
+						// decode on_save_model_field
+						$item->on_save_model_field = base64_decode($item->on_save_model_field);
+						// decode initiator_on_get_model
+						$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
+						// decode css_views
+						$item->css_views = base64_decode($item->css_views);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode initiator_on_save_model
+						$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fields/libraries.php

@@ -144,6 +144,7 @@ class JFormFieldLibraries extends JFormFieldList
 		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
 		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.target') . ' = 1');
 		$query->order('a.name ASC');
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
@@ -155,6 +156,7 @@ class JFormFieldLibraries extends JFormFieldList
 				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
 			}
 		}
+
 		return $options;
 	}
 }

admin/models/fields/librariesx.php

@@ -148,6 +148,7 @@ class JFormFieldLibrariesx extends JFormFieldList
 		$query->select($db->quoteName(array('a.id','a.name'),array('id','libraries_name')));
 		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.target') . ' = 1');
 		if ($libID > 0)
 		{
 			$query->where($db->quoteName('a.id') . ' != ' . (int) $libID);
@@ -163,6 +164,7 @@ class JFormFieldLibrariesx extends JFormFieldList
 				$options[] = JHtml::_('select.option', $item->id, $item->libraries_name);
 			}
 		}
+
 		return $options;
 	}
 }

admin/models/fields/library.php

@@ -157,6 +157,7 @@ class JFormFieldLibrary extends JFormFieldList
 				$options[] = JHtml::_('select.option', $item->id, $item->library_name);
 			}
 		}
+
 		return $options;
 	}
 }

admin/models/fieldtype.php

@@ -203,7 +203,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVxyfields()
+	public function getVyifields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -291,13 +291,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVxyfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVyifields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVxyfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVyifields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVxyfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVyifields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVxyfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVyifields($item->store, 'store');
 				}
 			}
 
@@ -311,7 +311,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationVxyfields($value,$name)
+	public function selectionTranslationVyifields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@@ -379,7 +379,8 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
 				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
 				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
+				6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))

admin/models/forms/field.js

@@ -9,61 +9,77 @@
  */
 
 // Some Global Values
-jform_vvvvwbtvxl_required = false;
+jform_vvvvwccvxn_required = false;
-jform_vvvvwbuvxm_required = false;
+jform_vvvvwcdvxo_required = false;
-jform_vvvvwbvvxn_required = false;
+jform_vvvvwcevxp_required = false;
-jform_vvvvwbwvxo_required = false;
+jform_vvvvwcfvxq_required = false;
-jform_vvvvwbxvxp_required = false;
+jform_vvvvwcgvxr_required = false;
+jform_vvvvwcjvxs_required = false;
+jform_vvvvwcjvxt_required = false;
+jform_vvvvwcjvxu_required = false;
+jform_vvvvwcjvxv_required = false;
+jform_vvvvwckvxw_required = false;
+jform_vvvvwckvxx_required = false;
+jform_vvvvwckvxy_required = false;
+jform_vvvvwckvxz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
-	vvvvwbt(datalenght_vvvvwbt);
+	vvvvwcc(datalenght_vvvvwcc);
 
-	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcd = jQuery("#jform_datadefault").val();
-	vvvvwbu(datadefault_vvvvwbu);
+	vvvvwcd(datadefault_vvvvwcd);
 
-	var datatype_vvvvwbv = jQuery("#jform_datatype").val();
+	var datatype_vvvvwce = jQuery("#jform_datatype").val();
-	vvvvwbv(datatype_vvvvwbv);
+	vvvvwce(datatype_vvvvwce);
 
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcf = jQuery("#jform_datatype").val();
-	vvvvwbw(datatype_vvvvwbw);
+	vvvvwcf(datatype_vvvvwcf);
 
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	vvvvwbx(datatype_vvvvwbx);
+	vvvvwcg(datatype_vvvvwcg);
 
-	var store_vvvvwby = jQuery("#jform_store").val();
+	var store_vvvvwch = jQuery("#jform_store").val();
-	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+	vvvvwch(store_vvvvwch,datatype_vvvvwch);
 
-	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var store_vvvvwcj = jQuery("#jform_store").val();
-	vvvvwca(add_css_view_vvvvwca);
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	vvvvwcj(store_vvvvwcj,datatype_vvvvwcj);
 
-	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	vvvvwcb(add_css_views_vvvvwcb);
+	var store_vvvvwck = jQuery("#jform_store").val();
+	vvvvwck(datatype_vvvvwck,store_vvvvwck);
 
-	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_view_vvvvwcl = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_view_footer_vvvvwcc);
+	vvvvwcl(add_css_view_vvvvwcl);
 
-	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwcm = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwcd(add_javascript_views_footer_vvvvwcd);
+	vvvvwcm(add_css_views_vvvvwcm);
+
+	var add_javascript_view_footer_vvvvwcn = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwcn(add_javascript_view_footer_vvvvwcn);
+
+	var add_javascript_views_footer_vvvvwco = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwco(add_javascript_views_footer_vvvvwco);
 });
 
-// the vvvvwbt function
+// the vvvvwcc function
-function vvvvwbt(datalenght_vvvvwbt)
+function vvvvwcc(datalenght_vvvvwcc)
 {
-	if (isSet(datalenght_vvvvwbt) && datalenght_vvvvwbt.constructor !== Array)
+	if (isSet(datalenght_vvvvwcc) && datalenght_vvvvwcc.constructor !== Array)
 	{
-		var temp_vvvvwbt = datalenght_vvvvwbt;
+		var temp_vvvvwcc = datalenght_vvvvwcc;
-		var datalenght_vvvvwbt = [];
+		var datalenght_vvvvwcc = [];
-		datalenght_vvvvwbt.push(temp_vvvvwbt);
+		datalenght_vvvvwcc.push(temp_vvvvwcc);
 	}
-	else if (!isSet(datalenght_vvvvwbt))
+	else if (!isSet(datalenght_vvvvwcc))
 	{
-		var datalenght_vvvvwbt = [];
+		var datalenght_vvvvwcc = [];
 	}
-	var datalenght = datalenght_vvvvwbt.some(datalenght_vvvvwbt_SomeFunc);
+	var datalenght = datalenght_vvvvwcc.some(datalenght_vvvvwcc_SomeFunc);
 
 
 	// set this function logic
@@ -71,55 +87,55 @@ function vvvvwbt(datalenght_vvvvwbt)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbtvxl_required)
+		if (jform_vvvvwccvxn_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_vvvvwbtvxl_required = false;
+			jform_vvvvwccvxn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbtvxl_required)
+		if (!jform_vvvvwccvxn_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_vvvvwbtvxl_required = true;
+			jform_vvvvwccvxn_required = true;
 		}
 	}
 }
 
-// the vvvvwbt Some function
+// the vvvvwcc Some function
-function datalenght_vvvvwbt_SomeFunc(datalenght_vvvvwbt)
+function datalenght_vvvvwcc_SomeFunc(datalenght_vvvvwcc)
 {
 	// set the function logic
-	if (datalenght_vvvvwbt == 'Other')
+	if (datalenght_vvvvwcc == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu function
+// the vvvvwcd function
-function vvvvwbu(datadefault_vvvvwbu)
+function vvvvwcd(datadefault_vvvvwcd)
 {
-	if (isSet(datadefault_vvvvwbu) && datadefault_vvvvwbu.constructor !== Array)
+	if (isSet(datadefault_vvvvwcd) && datadefault_vvvvwcd.constructor !== Array)
 	{
-		var temp_vvvvwbu = datadefault_vvvvwbu;
+		var temp_vvvvwcd = datadefault_vvvvwcd;
-		var datadefault_vvvvwbu = [];
+		var datadefault_vvvvwcd = [];
-		datadefault_vvvvwbu.push(temp_vvvvwbu);
+		datadefault_vvvvwcd.push(temp_vvvvwcd);
 	}
-	else if (!isSet(datadefault_vvvvwbu))
+	else if (!isSet(datadefault_vvvvwcd))
 	{
-		var datadefault_vvvvwbu = [];
+		var datadefault_vvvvwcd = [];
 	}
-	var datadefault = datadefault_vvvvwbu.some(datadefault_vvvvwbu_SomeFunc);
+	var datadefault = datadefault_vvvvwcd.some(datadefault_vvvvwcd_SomeFunc);
 
 
 	// set this function logic
@@ -127,55 +143,55 @@ function vvvvwbu(datadefault_vvvvwbu)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbuvxm_required)
+		if (jform_vvvvwcdvxo_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_vvvvwbuvxm_required = false;
+			jform_vvvvwcdvxo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbuvxm_required)
+		if (!jform_vvvvwcdvxo_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_vvvvwbuvxm_required = true;
+			jform_vvvvwcdvxo_required = true;
 		}
 	}
 }
 
-// the vvvvwbu Some function
+// the vvvvwcd Some function
-function datadefault_vvvvwbu_SomeFunc(datadefault_vvvvwbu)
+function datadefault_vvvvwcd_SomeFunc(datadefault_vvvvwcd)
 {
 	// set the function logic
-	if (datadefault_vvvvwbu == 'Other')
+	if (datadefault_vvvvwcd == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbv function
+// the vvvvwce function
-function vvvvwbv(datatype_vvvvwbv)
+function vvvvwce(datatype_vvvvwce)
 {
-	if (isSet(datatype_vvvvwbv) && datatype_vvvvwbv.constructor !== Array)
+	if (isSet(datatype_vvvvwce) && datatype_vvvvwce.constructor !== Array)
 	{
-		var temp_vvvvwbv = datatype_vvvvwbv;
+		var temp_vvvvwce = datatype_vvvvwce;
-		var datatype_vvvvwbv = [];
+		var datatype_vvvvwce = [];
-		datatype_vvvvwbv.push(temp_vvvvwbv);
+		datatype_vvvvwce.push(temp_vvvvwce);
 	}
-	else if (!isSet(datatype_vvvvwbv))
+	else if (!isSet(datatype_vvvvwce))
 	{
-		var datatype_vvvvwbv = [];
+		var datatype_vvvvwce = [];
 	}
-	var datatype = datatype_vvvvwbv.some(datatype_vvvvwbv_SomeFunc);
+	var datatype = datatype_vvvvwce.some(datatype_vvvvwce_SomeFunc);
 
 
 	// set this function logic
@@ -184,13 +200,13 @@ function vvvvwbv(datatype_vvvvwbv)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwbvvxn_required)
+		if (jform_vvvvwcevxp_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbvvxn_required = false;
+			jform_vvvvwcevxp_required = false;
 		}
 	}
 	else
@@ -198,42 +214,42 @@ function vvvvwbv(datatype_vvvvwbv)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwbvvxn_required)
+		if (!jform_vvvvwcevxp_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbvvxn_required = true;
+			jform_vvvvwcevxp_required = true;
 		}
 	}
 }
 
-// the vvvvwbv Some function
+// the vvvvwce Some function
-function datatype_vvvvwbv_SomeFunc(datatype_vvvvwbv)
+function datatype_vvvvwce_SomeFunc(datatype_vvvvwce)
 {
 	// set the function logic
-	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')
+	if (datatype_vvvvwce == 'CHAR' || datatype_vvvvwce == 'VARCHAR' || datatype_vvvvwce == 'DATETIME' || datatype_vvvvwce == 'DATE' || datatype_vvvvwce == 'TIME' || datatype_vvvvwce == 'INT' || datatype_vvvvwce == 'TINYINT' || datatype_vvvvwce == 'BIGINT' || datatype_vvvvwce == 'FLOAT' || datatype_vvvvwce == 'DECIMAL' || datatype_vvvvwce == 'DOUBLE')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw function
+// the vvvvwcf function
-function vvvvwbw(datatype_vvvvwbw)
+function vvvvwcf(datatype_vvvvwcf)
 {
-	if (isSet(datatype_vvvvwbw) && datatype_vvvvwbw.constructor !== Array)
+	if (isSet(datatype_vvvvwcf) && datatype_vvvvwcf.constructor !== Array)
 	{
-		var temp_vvvvwbw = datatype_vvvvwbw;
+		var temp_vvvvwcf = datatype_vvvvwcf;
-		var datatype_vvvvwbw = [];
+		var datatype_vvvvwcf = [];
-		datatype_vvvvwbw.push(temp_vvvvwbw);
+		datatype_vvvvwcf.push(temp_vvvvwcf);
 	}
-	else if (!isSet(datatype_vvvvwbw))
+	else if (!isSet(datatype_vvvvwcf))
 	{
-		var datatype_vvvvwbw = [];
+		var datatype_vvvvwcf = [];
 	}
-	var datatype = datatype_vvvvwbw.some(datatype_vvvvwbw_SomeFunc);
+	var datatype = datatype_vvvvwcf.some(datatype_vvvvwcf_SomeFunc);
 
 
 	// set this function logic
@@ -241,55 +257,55 @@ function vvvvwbw(datatype_vvvvwbw)
 	{
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		// add required attribute to datalenght field
-		if (jform_vvvvwbwvxo_required)
+		if (jform_vvvvwcfvxq_required)
 		{
 			updateFieldRequired('datalenght',0);
 			jQuery('#jform_datalenght').prop('required','required');
 			jQuery('#jform_datalenght').attr('aria-required',true);
 			jQuery('#jform_datalenght').addClass('required');
-			jform_vvvvwbwvxo_required = false;
+			jform_vvvvwcfvxq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		// remove required attribute from datalenght field
-		if (!jform_vvvvwbwvxo_required)
+		if (!jform_vvvvwcfvxq_required)
 		{
 			updateFieldRequired('datalenght',1);
 			jQuery('#jform_datalenght').removeAttr('required');
 			jQuery('#jform_datalenght').removeAttr('aria-required');
 			jQuery('#jform_datalenght').removeClass('required');
-			jform_vvvvwbwvxo_required = true;
+			jform_vvvvwcfvxq_required = true;
 		}
 	}
 }
 
-// the vvvvwbw Some function
+// the vvvvwcf Some function
-function datatype_vvvvwbw_SomeFunc(datatype_vvvvwbw)
+function datatype_vvvvwcf_SomeFunc(datatype_vvvvwcf)
 {
 	// set the function logic
-	if (datatype_vvvvwbw == 'CHAR' || datatype_vvvvwbw == 'VARCHAR' || datatype_vvvvwbw == 'INT' || datatype_vvvvwbw == 'TINYINT' || datatype_vvvvwbw == 'BIGINT' || datatype_vvvvwbw == 'FLOAT' || datatype_vvvvwbw == 'DECIMAL' || datatype_vvvvwbw == 'DOUBLE')
+	if (datatype_vvvvwcf == 'CHAR' || datatype_vvvvwcf == 'VARCHAR' || datatype_vvvvwcf == 'INT' || datatype_vvvvwcf == 'TINYINT' || datatype_vvvvwcf == 'BIGINT' || datatype_vvvvwcf == 'FLOAT' || datatype_vvvvwcf == 'DECIMAL' || datatype_vvvvwcf == 'DOUBLE')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbx function
+// the vvvvwcg function
-function vvvvwbx(datatype_vvvvwbx)
+function vvvvwcg(datatype_vvvvwcg)
 {
-	if (isSet(datatype_vvvvwbx) && datatype_vvvvwbx.constructor !== Array)
+	if (isSet(datatype_vvvvwcg) && datatype_vvvvwcg.constructor !== Array)
 	{
-		var temp_vvvvwbx = datatype_vvvvwbx;
+		var temp_vvvvwcg = datatype_vvvvwcg;
-		var datatype_vvvvwbx = [];
+		var datatype_vvvvwcg = [];
-		datatype_vvvvwbx.push(temp_vvvvwbx);
+		datatype_vvvvwcg.push(temp_vvvvwcg);
 	}
-	else if (!isSet(datatype_vvvvwbx))
+	else if (!isSet(datatype_vvvvwcg))
 	{
-		var datatype_vvvvwbx = [];
+		var datatype_vvvvwcg = [];
 	}
-	var datatype = datatype_vvvvwbx.some(datatype_vvvvwbx_SomeFunc);
+	var datatype = datatype_vvvvwcg.some(datatype_vvvvwcg_SomeFunc);
 
 
 	// set this function logic
@@ -297,67 +313,67 @@ function vvvvwbx(datatype_vvvvwbx)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwbxvxp_required)
+		if (jform_vvvvwcgvxr_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwbxvxp_required = false;
+			jform_vvvvwcgvxr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwbxvxp_required)
+		if (!jform_vvvvwcgvxr_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwbxvxp_required = true;
+			jform_vvvvwcgvxr_required = true;
 		}
 	}
 }
 
-// the vvvvwbx Some function
+// the vvvvwcg Some function
-function datatype_vvvvwbx_SomeFunc(datatype_vvvvwbx)
+function datatype_vvvvwcg_SomeFunc(datatype_vvvvwcg)
 {
 	// 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')
+	if (datatype_vvvvwcg == 'CHAR' || datatype_vvvvwcg == 'VARCHAR' || datatype_vvvvwcg == 'TEXT' || datatype_vvvvwcg == 'MEDIUMTEXT' || datatype_vvvvwcg == 'LONGTEXT' || datatype_vvvvwcg == 'BLOB' || datatype_vvvvwcg == 'TINYBLOB' || datatype_vvvvwcg == 'MEDIUMBLOB' || datatype_vvvvwcg == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwby function
+// the vvvvwch function
-function vvvvwby(store_vvvvwby,datatype_vvvvwby)
+function vvvvwch(store_vvvvwch,datatype_vvvvwch)
 {
-	if (isSet(store_vvvvwby) && store_vvvvwby.constructor !== Array)
+	if (isSet(store_vvvvwch) && store_vvvvwch.constructor !== Array)
 	{
-		var temp_vvvvwby = store_vvvvwby;
+		var temp_vvvvwch = store_vvvvwch;
-		var store_vvvvwby = [];
+		var store_vvvvwch = [];
-		store_vvvvwby.push(temp_vvvvwby);
+		store_vvvvwch.push(temp_vvvvwch);
 	}
-	else if (!isSet(store_vvvvwby))
+	else if (!isSet(store_vvvvwch))
 	{
-		var store_vvvvwby = [];
+		var store_vvvvwch = [];
 	}
-	var store = store_vvvvwby.some(store_vvvvwby_SomeFunc);
+	var store = store_vvvvwch.some(store_vvvvwch_SomeFunc);
 
-	if (isSet(datatype_vvvvwby) && datatype_vvvvwby.constructor !== Array)
+	if (isSet(datatype_vvvvwch) && datatype_vvvvwch.constructor !== Array)
 	{
-		var temp_vvvvwby = datatype_vvvvwby;
+		var temp_vvvvwch = datatype_vvvvwch;
-		var datatype_vvvvwby = [];
+		var datatype_vvvvwch = [];
-		datatype_vvvvwby.push(temp_vvvvwby);
+		datatype_vvvvwch.push(temp_vvvvwch);
 	}
-	else if (!isSet(datatype_vvvvwby))
+	else if (!isSet(datatype_vvvvwch))
 	{
-		var datatype_vvvvwby = [];
+		var datatype_vvvvwch = [];
 	}
-	var datatype = datatype_vvvvwby.some(datatype_vvvvwby_SomeFunc);
+	var datatype = datatype_vvvvwch.some(datatype_vvvvwch_SomeFunc);
 
 
 	// set this function logic
@@ -371,33 +387,315 @@ function vvvvwby(store_vvvvwby,datatype_vvvvwby)
 	}
 }
 
-// the vvvvwby Some function
+// the vvvvwch Some function
-function store_vvvvwby_SomeFunc(store_vvvvwby)
+function store_vvvvwch_SomeFunc(store_vvvvwch)
 {
 	// set the function logic
-	if (store_vvvvwby == 4)
+	if (store_vvvvwch == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwby Some function
+// the vvvvwch Some function
-function datatype_vvvvwby_SomeFunc(datatype_vvvvwby)
+function datatype_vvvvwch_SomeFunc(datatype_vvvvwch)
 {
 	// set the function logic
-	if (datatype_vvvvwby == 'CHAR' || datatype_vvvvwby == 'VARCHAR' || datatype_vvvvwby == 'TEXT' || datatype_vvvvwby == 'MEDIUMTEXT' || datatype_vvvvwby == 'LONGTEXT' || datatype_vvvvwby == 'BLOB' || datatype_vvvvwby == 'TINYBLOB' || datatype_vvvvwby == 'MEDIUMBLOB' || datatype_vvvvwby == 'LONGBLOB')
+	if (datatype_vvvvwch == 'CHAR' || datatype_vvvvwch == 'VARCHAR' || datatype_vvvvwch == 'TEXT' || datatype_vvvvwch == 'MEDIUMTEXT' || datatype_vvvvwch == 'LONGTEXT' || datatype_vvvvwch == 'BLOB' || datatype_vvvvwch == 'TINYBLOB' || datatype_vvvvwch == 'MEDIUMBLOB' || datatype_vvvvwch == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwca function
+// the vvvvwcj function
-function vvvvwca(add_css_view_vvvvwca)
+function vvvvwcj(store_vvvvwcj,datatype_vvvvwcj)
+{
+	if (isSet(store_vvvvwcj) && store_vvvvwcj.constructor !== Array)
+	{
+		var temp_vvvvwcj = store_vvvvwcj;
+		var store_vvvvwcj = [];
+		store_vvvvwcj.push(temp_vvvvwcj);
+	}
+	else if (!isSet(store_vvvvwcj))
+	{
+		var store_vvvvwcj = [];
+	}
+	var store = store_vvvvwcj.some(store_vvvvwcj_SomeFunc);
+
+	if (isSet(datatype_vvvvwcj) && datatype_vvvvwcj.constructor !== Array)
+	{
+		var temp_vvvvwcj = datatype_vvvvwcj;
+		var datatype_vvvvwcj = [];
+		datatype_vvvvwcj.push(temp_vvvvwcj);
+	}
+	else if (!isSet(datatype_vvvvwcj))
+	{
+		var datatype_vvvvwcj = [];
+	}
+	var datatype = datatype_vvvvwcj.some(datatype_vvvvwcj_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
+		// add required attribute to initiator_on_get_model field
+		if (jform_vvvvwcjvxs_required)
+		{
+			updateFieldRequired('initiator_on_get_model',0);
+			jQuery('#jform_initiator_on_get_model').prop('required','required');
+			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_get_model').addClass('required');
+			jform_vvvvwcjvxs_required = false;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
+		// add required attribute to initiator_on_save_model field
+		if (jform_vvvvwcjvxt_required)
+		{
+			updateFieldRequired('initiator_on_save_model',0);
+			jQuery('#jform_initiator_on_save_model').prop('required','required');
+			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_save_model').addClass('required');
+			jform_vvvvwcjvxt_required = false;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').show();
+		// add required attribute to on_save_model_field field
+		if (jform_vvvvwcjvxu_required)
+		{
+			updateFieldRequired('on_save_model_field',0);
+			jQuery('#jform_on_save_model_field').prop('required','required');
+			jQuery('#jform_on_save_model_field').attr('aria-required',true);
+			jQuery('#jform_on_save_model_field').addClass('required');
+			jform_vvvvwcjvxu_required = false;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
+		jQuery('#jform_on_get_model_field').closest('.control-group').show();
+		// add required attribute to on_get_model_field field
+		if (jform_vvvvwcjvxv_required)
+		{
+			updateFieldRequired('on_get_model_field',0);
+			jQuery('#jform_on_get_model_field').prop('required','required');
+			jQuery('#jform_on_get_model_field').attr('aria-required',true);
+			jQuery('#jform_on_get_model_field').addClass('required');
+			jform_vvvvwcjvxv_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_get_model field
+		if (!jform_vvvvwcjvxs_required)
+		{
+			updateFieldRequired('initiator_on_get_model',1);
+			jQuery('#jform_initiator_on_get_model').removeAttr('required');
+			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_get_model').removeClass('required');
+			jform_vvvvwcjvxs_required = true;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_save_model field
+		if (!jform_vvvvwcjvxt_required)
+		{
+			updateFieldRequired('initiator_on_save_model',1);
+			jQuery('#jform_initiator_on_save_model').removeAttr('required');
+			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_save_model').removeClass('required');
+			jform_vvvvwcjvxt_required = true;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
+		// remove required attribute from on_save_model_field field
+		if (!jform_vvvvwcjvxu_required)
+		{
+			updateFieldRequired('on_save_model_field',1);
+			jQuery('#jform_on_save_model_field').removeAttr('required');
+			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_save_model_field').removeClass('required');
+			jform_vvvvwcjvxu_required = true;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
+		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
+		// remove required attribute from on_get_model_field field
+		if (!jform_vvvvwcjvxv_required)
+		{
+			updateFieldRequired('on_get_model_field',1);
+			jQuery('#jform_on_get_model_field').removeAttr('required');
+			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_get_model_field').removeClass('required');
+			jform_vvvvwcjvxv_required = true;
+		}
+	}
+}
+
+// the vvvvwcj Some function
+function store_vvvvwcj_SomeFunc(store_vvvvwcj)
 {
 	// set the function logic
-	if (add_css_view_vvvvwca == 1)
+	if (store_vvvvwcj == 6)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcj Some function
+function datatype_vvvvwcj_SomeFunc(datatype_vvvvwcj)
+{
+	// set the function logic
+	if (datatype_vvvvwcj == 'CHAR' || datatype_vvvvwcj == 'VARCHAR' || datatype_vvvvwcj == 'TEXT' || datatype_vvvvwcj == 'MEDIUMTEXT' || datatype_vvvvwcj == 'LONGTEXT' || datatype_vvvvwcj == 'BLOB' || datatype_vvvvwcj == 'TINYBLOB' || datatype_vvvvwcj == 'MEDIUMBLOB' || datatype_vvvvwcj == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwck function
+function vvvvwck(datatype_vvvvwck,store_vvvvwck)
+{
+	if (isSet(datatype_vvvvwck) && datatype_vvvvwck.constructor !== Array)
+	{
+		var temp_vvvvwck = datatype_vvvvwck;
+		var datatype_vvvvwck = [];
+		datatype_vvvvwck.push(temp_vvvvwck);
+	}
+	else if (!isSet(datatype_vvvvwck))
+	{
+		var datatype_vvvvwck = [];
+	}
+	var datatype = datatype_vvvvwck.some(datatype_vvvvwck_SomeFunc);
+
+	if (isSet(store_vvvvwck) && store_vvvvwck.constructor !== Array)
+	{
+		var temp_vvvvwck = store_vvvvwck;
+		var store_vvvvwck = [];
+		store_vvvvwck.push(temp_vvvvwck);
+	}
+	else if (!isSet(store_vvvvwck))
+	{
+		var store_vvvvwck = [];
+	}
+	var store = store_vvvvwck.some(store_vvvvwck_SomeFunc);
+
+
+	// set this function logic
+	if (datatype && store)
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
+		// add required attribute to initiator_on_get_model field
+		if (jform_vvvvwckvxw_required)
+		{
+			updateFieldRequired('initiator_on_get_model',0);
+			jQuery('#jform_initiator_on_get_model').prop('required','required');
+			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_get_model').addClass('required');
+			jform_vvvvwckvxw_required = false;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
+		// add required attribute to initiator_on_save_model field
+		if (jform_vvvvwckvxx_required)
+		{
+			updateFieldRequired('initiator_on_save_model',0);
+			jQuery('#jform_initiator_on_save_model').prop('required','required');
+			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
+			jQuery('#jform_initiator_on_save_model').addClass('required');
+			jform_vvvvwckvxx_required = false;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').show();
+		// add required attribute to on_save_model_field field
+		if (jform_vvvvwckvxy_required)
+		{
+			updateFieldRequired('on_save_model_field',0);
+			jQuery('#jform_on_save_model_field').prop('required','required');
+			jQuery('#jform_on_save_model_field').attr('aria-required',true);
+			jQuery('#jform_on_save_model_field').addClass('required');
+			jform_vvvvwckvxy_required = false;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
+		jQuery('#jform_on_get_model_field').closest('.control-group').show();
+		// add required attribute to on_get_model_field field
+		if (jform_vvvvwckvxz_required)
+		{
+			updateFieldRequired('on_get_model_field',0);
+			jQuery('#jform_on_get_model_field').prop('required','required');
+			jQuery('#jform_on_get_model_field').attr('aria-required',true);
+			jQuery('#jform_on_get_model_field').addClass('required');
+			jform_vvvvwckvxz_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_get_model field
+		if (!jform_vvvvwckvxw_required)
+		{
+			updateFieldRequired('initiator_on_get_model',1);
+			jQuery('#jform_initiator_on_get_model').removeAttr('required');
+			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_get_model').removeClass('required');
+			jform_vvvvwckvxw_required = true;
+		}
+		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
+		// remove required attribute from initiator_on_save_model field
+		if (!jform_vvvvwckvxx_required)
+		{
+			updateFieldRequired('initiator_on_save_model',1);
+			jQuery('#jform_initiator_on_save_model').removeAttr('required');
+			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
+			jQuery('#jform_initiator_on_save_model').removeClass('required');
+			jform_vvvvwckvxx_required = true;
+		}
+		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
+		// remove required attribute from on_save_model_field field
+		if (!jform_vvvvwckvxy_required)
+		{
+			updateFieldRequired('on_save_model_field',1);
+			jQuery('#jform_on_save_model_field').removeAttr('required');
+			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_save_model_field').removeClass('required');
+			jform_vvvvwckvxy_required = true;
+		}
+		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
+		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
+		// remove required attribute from on_get_model_field field
+		if (!jform_vvvvwckvxz_required)
+		{
+			updateFieldRequired('on_get_model_field',1);
+			jQuery('#jform_on_get_model_field').removeAttr('required');
+			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
+			jQuery('#jform_on_get_model_field').removeClass('required');
+			jform_vvvvwckvxz_required = true;
+		}
+	}
+}
+
+// the vvvvwck Some function
+function datatype_vvvvwck_SomeFunc(datatype_vvvvwck)
+{
+	// set the function logic
+	if (datatype_vvvvwck == 'CHAR' || datatype_vvvvwck == 'VARCHAR' || datatype_vvvvwck == 'TEXT' || datatype_vvvvwck == 'MEDIUMTEXT' || datatype_vvvvwck == 'LONGTEXT' || datatype_vvvvwck == 'BLOB' || datatype_vvvvwck == 'TINYBLOB' || datatype_vvvvwck == 'MEDIUMBLOB' || datatype_vvvvwck == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwck Some function
+function store_vvvvwck_SomeFunc(store_vvvvwck)
+{
+	// set the function logic
+	if (store_vvvvwck == 6)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcl function
+function vvvvwcl(add_css_view_vvvvwcl)
+{
+	// set the function logic
+	if (add_css_view_vvvvwcl == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 	}
@@ -407,11 +705,11 @@ function vvvvwca(add_css_view_vvvvwca)
 	}
 }
 
-// the vvvvwcb function
+// the vvvvwcm function
-function vvvvwcb(add_css_views_vvvvwcb)
+function vvvvwcm(add_css_views_vvvvwcm)
 {
 	// set the function logic
-	if (add_css_views_vvvvwcb == 1)
+	if (add_css_views_vvvvwcm == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 	}
@@ -421,11 +719,11 @@ function vvvvwcb(add_css_views_vvvvwcb)
 	}
 }
 
-// the vvvvwcc function
+// the vvvvwcn function
-function vvvvwcc(add_javascript_view_footer_vvvvwcc)
+function vvvvwcn(add_javascript_view_footer_vvvvwcn)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwcc == 1)
+	if (add_javascript_view_footer_vvvvwcn == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 	}
@@ -435,11 +733,11 @@ function vvvvwcc(add_javascript_view_footer_vvvvwcc)
 	}
 }
 
-// the vvvvwcd function
+// the vvvvwco function
-function vvvvwcd(add_javascript_views_footer_vvvvwcd)
+function vvvvwco(add_javascript_views_footer_vvvvwco)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwcd == 1)
+	if (add_javascript_views_footer_vvvvwco == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 	}

admin/models/forms/field.xml

@@ -219,6 +219,8 @@
 				COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
 			<option value="4">
 				COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option>
+			<option value="6">
+				COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM</option>
 		</field>
 		<!-- Catid Field. Type: Category. (joomla) -->
 		<field
@@ -230,68 +232,51 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
-		<!-- Css_views Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_views"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Add_css_views Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_views"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
-		<!-- Css_view Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_view"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="css"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Add_css_view Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_view"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
 		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
+		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
+		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_get_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
+			required="true"
+		/>
+		<!-- On_save_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_save_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL"
+			rows="3"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_HINT"
+			required="true"
+		/>
+		<!-- Initiator_on_get_model Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="initiator_on_get_model"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT"
+			required="false"
+		/>
+		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
 		<!-- Datalenght Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -342,10 +327,34 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
-		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
+		<field
-		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+			type="radio"
-		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+			name="add_javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
+		<!-- Add_css_views Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_views"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
 		<!-- Datadefault_other Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -399,11 +408,11 @@
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
+		<!-- Add_css_view Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_javascript_view_footer"
+			name="add_css_view"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -413,6 +422,46 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+		<!-- Css_view Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css_view"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Css_views Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="css_views"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="css"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
 		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
 		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
@@ -431,8 +480,8 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_expert_field_save_mode Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
+		<field type="note" name="note_expert_field_save_mode" label="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION" heading="h4" class="alert alert-success note_expert_encryption note_expert_field_save_mode" />
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -449,11 +498,18 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
 		<field
-			type="hidden"
+			type="textarea"
-			name="not_required"
+			name="initiator_on_save_model"
-			default="[]"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
+			required="false"
 		/>
 		<!-- Xml Field. Type: Hidden. (joomla) -->
 		<field

admin/models/forms/fieldtype.xml

@@ -375,6 +375,8 @@
 				COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
 			<option value="4">
 				COM_COMPONENTBUILDER_FIELDTYPE_WHMCSKEY_ENCRYPTION</option>
+			<option value="6">
+				COM_COMPONENTBUILDER_FIELDTYPE_EXPERT_MODE_CUSTOM</option>
 		</field>
 		<!-- Datatype Field. Type: List. (joomla) -->
 		<field

admin/models/forms/help_document.js

@@ -9,112 +9,112 @@
  */
 
 // Some Global Values
-jform_vvvvwdcvyj_required = false;
+jform_vvvvwdnvyt_required = false;
-jform_vvvvwddvyk_required = false;
+jform_vvvvwdovyu_required = false;
-jform_vvvvwdevyl_required = false;
+jform_vvvvwdpvyv_required = false;
-jform_vvvvwdfvym_required = false;
+jform_vvvvwdqvyw_required = false;
-jform_vvvvwdhvyn_required = false;
+jform_vvvvwdsvyx_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdn = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdc(location_vvvvwdc);
+	vvvvwdn(location_vvvvwdn);
 
-	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdo = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdd(location_vvvvwdd);
+	vvvvwdo(location_vvvvwdo);
 
-	var type_vvvvwde = jQuery("#jform_type").val();
+	var type_vvvvwdp = jQuery("#jform_type").val();
-	vvvvwde(type_vvvvwde);
+	vvvvwdp(type_vvvvwdp);
 
-	var type_vvvvwdf = jQuery("#jform_type").val();
+	var type_vvvvwdq = jQuery("#jform_type").val();
-	vvvvwdf(type_vvvvwdf);
+	vvvvwdq(type_vvvvwdq);
 
-	var type_vvvvwdg = jQuery("#jform_type").val();
+	var type_vvvvwdr = jQuery("#jform_type").val();
-	vvvvwdg(type_vvvvwdg);
+	vvvvwdr(type_vvvvwdr);
 
-	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwds = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwdh(target_vvvvwdh);
+	vvvvwds(target_vvvvwds);
 });
 
-// the vvvvwdc function
+// the vvvvwdn function
-function vvvvwdc(location_vvvvwdc)
+function vvvvwdn(location_vvvvwdn)
 {
 	// set the function logic
-	if (location_vvvvwdc == 1)
+	if (location_vvvvwdn == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwdcvyj_required)
+		if (jform_vvvvwdnvyt_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_vvvvwdcvyj_required = false;
+			jform_vvvvwdnvyt_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwdcvyj_required)
+		if (!jform_vvvvwdnvyt_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_vvvvwdcvyj_required = true;
+			jform_vvvvwdnvyt_required = true;
 		}
 	}
 }
 
-// the vvvvwdd function
+// the vvvvwdo function
-function vvvvwdd(location_vvvvwdd)
+function vvvvwdo(location_vvvvwdo)
 {
 	// set the function logic
-	if (location_vvvvwdd == 2)
+	if (location_vvvvwdo == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwddvyk_required)
+		if (jform_vvvvwdovyu_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_vvvvwddvyk_required = false;
+			jform_vvvvwdovyu_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwddvyk_required)
+		if (!jform_vvvvwdovyu_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_vvvvwddvyk_required = true;
+			jform_vvvvwdovyu_required = true;
 		}
 	}
 }
 
-// the vvvvwde function
+// the vvvvwdp function
-function vvvvwde(type_vvvvwde)
+function vvvvwdp(type_vvvvwdp)
 {
-	if (isSet(type_vvvvwde) && type_vvvvwde.constructor !== Array)
+	if (isSet(type_vvvvwdp) && type_vvvvwdp.constructor !== Array)
 	{
-		var temp_vvvvwde = type_vvvvwde;
+		var temp_vvvvwdp = type_vvvvwdp;
-		var type_vvvvwde = [];
+		var type_vvvvwdp = [];
-		type_vvvvwde.push(temp_vvvvwde);
+		type_vvvvwdp.push(temp_vvvvwdp);
 	}
-	else if (!isSet(type_vvvvwde))
+	else if (!isSet(type_vvvvwdp))
 	{
-		var type_vvvvwde = [];
+		var type_vvvvwdp = [];
 	}
-	var type = type_vvvvwde.some(type_vvvvwde_SomeFunc);
+	var type = type_vvvvwdp.some(type_vvvvwdp_SomeFunc);
 
 
 	// set this function logic
@@ -122,55 +122,55 @@ function vvvvwde(type_vvvvwde)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwdevyl_required)
+		if (jform_vvvvwdpvyv_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwdevyl_required = false;
+			jform_vvvvwdpvyv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwdevyl_required)
+		if (!jform_vvvvwdpvyv_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwdevyl_required = true;
+			jform_vvvvwdpvyv_required = true;
 		}
 	}
 }
 
-// the vvvvwde Some function
+// the vvvvwdp Some function
-function type_vvvvwde_SomeFunc(type_vvvvwde)
+function type_vvvvwdp_SomeFunc(type_vvvvwdp)
 {
 	// set the function logic
-	if (type_vvvvwde == 3)
+	if (type_vvvvwdp == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdf function
+// the vvvvwdq function
-function vvvvwdf(type_vvvvwdf)
+function vvvvwdq(type_vvvvwdq)
 {
-	if (isSet(type_vvvvwdf) && type_vvvvwdf.constructor !== Array)
+	if (isSet(type_vvvvwdq) && type_vvvvwdq.constructor !== Array)
 	{
-		var temp_vvvvwdf = type_vvvvwdf;
+		var temp_vvvvwdq = type_vvvvwdq;
-		var type_vvvvwdf = [];
+		var type_vvvvwdq = [];
-		type_vvvvwdf.push(temp_vvvvwdf);
+		type_vvvvwdq.push(temp_vvvvwdq);
 	}
-	else if (!isSet(type_vvvvwdf))
+	else if (!isSet(type_vvvvwdq))
 	{
-		var type_vvvvwdf = [];
+		var type_vvvvwdq = [];
 	}
-	var type = type_vvvvwdf.some(type_vvvvwdf_SomeFunc);
+	var type = type_vvvvwdq.some(type_vvvvwdq_SomeFunc);
 
 
 	// set this function logic
@@ -178,55 +178,55 @@ function vvvvwdf(type_vvvvwdf)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwdfvym_required)
+		if (jform_vvvvwdqvyw_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwdfvym_required = false;
+			jform_vvvvwdqvyw_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwdfvym_required)
+		if (!jform_vvvvwdqvyw_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwdfvym_required = true;
+			jform_vvvvwdqvyw_required = true;
 		}
 	}
 }
 
-// the vvvvwdf Some function
+// the vvvvwdq Some function
-function type_vvvvwdf_SomeFunc(type_vvvvwdf)
+function type_vvvvwdq_SomeFunc(type_vvvvwdq)
 {
 	// set the function logic
-	if (type_vvvvwdf == 1)
+	if (type_vvvvwdq == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdg function
+// the vvvvwdr function
-function vvvvwdg(type_vvvvwdg)
+function vvvvwdr(type_vvvvwdr)
 {
-	if (isSet(type_vvvvwdg) && type_vvvvwdg.constructor !== Array)
+	if (isSet(type_vvvvwdr) && type_vvvvwdr.constructor !== Array)
 	{
-		var temp_vvvvwdg = type_vvvvwdg;
+		var temp_vvvvwdr = type_vvvvwdr;
-		var type_vvvvwdg = [];
+		var type_vvvvwdr = [];
-		type_vvvvwdg.push(temp_vvvvwdg);
+		type_vvvvwdr.push(temp_vvvvwdr);
 	}
-	else if (!isSet(type_vvvvwdg))
+	else if (!isSet(type_vvvvwdr))
 	{
-		var type_vvvvwdg = [];
+		var type_vvvvwdr = [];
 	}
-	var type = type_vvvvwdg.some(type_vvvvwdg_SomeFunc);
+	var type = type_vvvvwdr.some(type_vvvvwdr_SomeFunc);
 
 
 	// set this function logic
@@ -240,45 +240,45 @@ function vvvvwdg(type_vvvvwdg)
 	}
 }
 
-// the vvvvwdg Some function
+// the vvvvwdr Some function
-function type_vvvvwdg_SomeFunc(type_vvvvwdg)
+function type_vvvvwdr_SomeFunc(type_vvvvwdr)
 {
 	// set the function logic
-	if (type_vvvvwdg == 2)
+	if (type_vvvvwdr == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdh function
+// the vvvvwds function
-function vvvvwdh(target_vvvvwdh)
+function vvvvwds(target_vvvvwds)
 {
 	// set the function logic
-	if (target_vvvvwdh == 1)
+	if (target_vvvvwds == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwdhvyn_required)
+		if (jform_vvvvwdsvyx_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwdhvyn_required = false;
+			jform_vvvvwdsvyx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwdhvyn_required)
+		if (!jform_vvvvwdsvyx_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwdhvyn_required = true;
+			jform_vvvvwdsvyx_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -9,39 +9,64 @@
  */
 
 // Some Global Values
-jform_vvvvwbmvxj_required = false;
+jform_vvvvwbnvxj_required = false;
-jform_vvvvwbsvxk_required = false;
+jform_vvvvwbzvxk_required = false;
+jform_vvvvwcbvxl_required = false;
+jform_vvvvwcbvxm_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
 	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbl(how_vvvvwbl);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
-
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
-	var how_vvvvwbm = jQuery("#jform_how").val();
-	vvvvwbm(how_vvvvwbm);
 
 	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbn(how_vvvvwbn);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
-
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
-	var how_vvvvwbo = jQuery("#jform_how").val();
-	vvvvwbo(how_vvvvwbo);
 
 	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbp(how_vvvvwbp);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
-
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
-	var how_vvvvwbq = jQuery("#jform_how").val();
-	vvvvwbq(how_vvvvwbq);
 
 	var how_vvvvwbr = jQuery("#jform_how").val();
-	vvvvwbr(how_vvvvwbr);
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
 
-	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwbt = jQuery("#jform_how").val();
-	vvvvwbs(type_vvvvwbs);
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
+
+	var target_vvvvwcb = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcb(target_vvvvwcb);
 });
 
 // the vvvvwbl function
-function vvvvwbl(how_vvvvwbl)
+function vvvvwbl(how_vvvvwbl,target_vvvvwbl)
 {
 	if (isSet(how_vvvvwbl) && how_vvvvwbl.constructor !== Array)
 	{
@@ -55,9 +80,21 @@ function vvvvwbl(how_vvvvwbl)
 	}
 	var how = how_vvvvwbl.some(how_vvvvwbl_SomeFunc);
 
+	if (isSet(target_vvvvwbl) && target_vvvvwbl.constructor !== Array)
+	{
+		var temp_vvvvwbl = target_vvvvwbl;
+		var target_vvvvwbl = [];
+		target_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(target_vvvvwbl))
+	{
+		var target_vvvvwbl = [];
+	}
+	var target = target_vvvvwbl.some(target_vvvvwbl_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
 		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
@@ -78,56 +115,11 @@ function how_vvvvwbl_SomeFunc(how_vvvvwbl)
 	return false;
 }
 
-// the vvvvwbm function
+// the vvvvwbl Some function
-function vvvvwbm(how_vvvvwbm)
+function target_vvvvwbl_SomeFunc(target_vvvvwbl)
-{
-	if (isSet(how_vvvvwbm) && how_vvvvwbm.constructor !== Array)
-	{
-		var temp_vvvvwbm = how_vvvvwbm;
-		var how_vvvvwbm = [];
-		how_vvvvwbm.push(temp_vvvvwbm);
-	}
-	else if (!isSet(how_vvvvwbm))
-	{
-		var how_vvvvwbm = [];
-	}
-	var how = how_vvvvwbm.some(how_vvvvwbm_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		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('#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;
-		}
-	}
-}
-
-// the vvvvwbm Some function
-function how_vvvvwbm_SomeFunc(how_vvvvwbm)
 {
 	// set the function logic
-	if (how_vvvvwbm == 3)
+	if (target_vvvvwbl == 1)
 	{
 		return true;
 	}
@@ -135,7 +127,7 @@ function how_vvvvwbm_SomeFunc(how_vvvvwbm)
 }
 
 // the vvvvwbn function
-function vvvvwbn(how_vvvvwbn)
+function vvvvwbn(how_vvvvwbn,target_vvvvwbn)
 {
 	if (isSet(how_vvvvwbn) && how_vvvvwbn.constructor !== Array)
 	{
@@ -149,15 +141,45 @@ function vvvvwbn(how_vvvvwbn)
 	}
 	var how = how_vvvvwbn.some(how_vvvvwbn_SomeFunc);
 
+	if (isSet(target_vvvvwbn) && target_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = target_vvvvwbn;
+		var target_vvvvwbn = [];
+		target_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(target_vvvvwbn))
+	{
+		var target_vvvvwbn = [];
+	}
+	var target = target_vvvvwbn.some(target_vvvvwbn_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
-		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_vvvvwbnvxj_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_vvvvwbnvxj_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_vvvvwbnvxj_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_vvvvwbnvxj_required = true;
+		}
 	}
 }
 
@@ -165,45 +187,18 @@ function vvvvwbn(how_vvvvwbn)
 function how_vvvvwbn_SomeFunc(how_vvvvwbn)
 {
 	// set the function logic
-	if (how_vvvvwbn == 2 || how_vvvvwbn == 3)
+	if (how_vvvvwbn == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbo function
+// the vvvvwbn Some function
-function vvvvwbo(how_vvvvwbo)
+function target_vvvvwbn_SomeFunc(target_vvvvwbn)
-{
-	if (isSet(how_vvvvwbo) && how_vvvvwbo.constructor !== Array)
-	{
-		var temp_vvvvwbo = how_vvvvwbo;
-		var how_vvvvwbo = [];
-		how_vvvvwbo.push(temp_vvvvwbo);
-	}
-	else if (!isSet(how_vvvvwbo))
-	{
-		var how_vvvvwbo = [];
-	}
-	var how = how_vvvvwbo.some(how_vvvvwbo_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwbo Some function
-function how_vvvvwbo_SomeFunc(how_vvvvwbo)
 {
 	// set the function logic
-	if (how_vvvvwbo == 1 || how_vvvvwbo == 2 || how_vvvvwbo == 3)
+	if (target_vvvvwbn == 1)
 	{
 		return true;
 	}
@@ -211,7 +206,7 @@ function how_vvvvwbo_SomeFunc(how_vvvvwbo)
 }
 
 // the vvvvwbp function
-function vvvvwbp(how_vvvvwbp)
+function vvvvwbp(how_vvvvwbp,target_vvvvwbp)
 {
 	if (isSet(how_vvvvwbp) && how_vvvvwbp.constructor !== Array)
 	{
@@ -225,19 +220,27 @@ function vvvvwbp(how_vvvvwbp)
 	}
 	var how = how_vvvvwbp.some(how_vvvvwbp_SomeFunc);
 
+	if (isSet(target_vvvvwbp) && target_vvvvwbp.constructor !== Array)
+	{
+		var temp_vvvvwbp = target_vvvvwbp;
+		var target_vvvvwbp = [];
+		target_vvvvwbp.push(temp_vvvvwbp);
+	}
+	else if (!isSet(target_vvvvwbp))
+	{
+		var target_vvvvwbp = [];
+	}
+	var target = target_vvvvwbp.some(target_vvvvwbp_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -245,47 +248,18 @@ function vvvvwbp(how_vvvvwbp)
 function how_vvvvwbp_SomeFunc(how_vvvvwbp)
 {
 	// set the function logic
-	if (how_vvvvwbp == 0)
+	if (how_vvvvwbp == 2 || how_vvvvwbp == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbq function
+// the vvvvwbp Some function
-function vvvvwbq(how_vvvvwbq)
+function target_vvvvwbp_SomeFunc(target_vvvvwbp)
-{
-	if (isSet(how_vvvvwbq) && how_vvvvwbq.constructor !== Array)
-	{
-		var temp_vvvvwbq = how_vvvvwbq;
-		var how_vvvvwbq = [];
-		how_vvvvwbq.push(temp_vvvvwbq);
-	}
-	else if (!isSet(how_vvvvwbq))
-	{
-		var 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)
+	if (target_vvvvwbp == 1)
 	{
 		return true;
 	}
@@ -293,7 +267,7 @@ function how_vvvvwbq_SomeFunc(how_vvvvwbq)
 }
 
 // the vvvvwbr function
-function vvvvwbr(how_vvvvwbr)
+function vvvvwbr(how_vvvvwbr,target_vvvvwbr)
 {
 	if (isSet(how_vvvvwbr) && how_vvvvwbr.constructor !== Array)
 	{
@@ -307,9 +281,338 @@ function vvvvwbr(how_vvvvwbr)
 	}
 	var how = how_vvvvwbr.some(how_vvvvwbr_SomeFunc);
 
+	if (isSet(target_vvvvwbr) && target_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = target_vvvvwbr;
+		var target_vvvvwbr = [];
+		target_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(target_vvvvwbr))
+	{
+		var target_vvvvwbr = [];
+	}
+	var target = target_vvvvwbr.some(target_vvvvwbr_SomeFunc);
+
 
 	// set this function logic
-	if (how)
+	if (how && target)
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbr Some function
+function how_vvvvwbr_SomeFunc(how_vvvvwbr)
+{
+	// set the function logic
+	if (how_vvvvwbr == 1 || how_vvvvwbr == 2 || how_vvvvwbr == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbr Some function
+function target_vvvvwbr_SomeFunc(target_vvvvwbr)
+{
+	// set the function logic
+	if (target_vvvvwbr == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbt function
+function vvvvwbt(how_vvvvwbt,target_vvvvwbt)
+{
+	if (isSet(how_vvvvwbt) && how_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = how_vvvvwbt;
+		var how_vvvvwbt = [];
+		how_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(how_vvvvwbt))
+	{
+		var how_vvvvwbt = [];
+	}
+	var how = how_vvvvwbt.some(how_vvvvwbt_SomeFunc);
+
+	if (isSet(target_vvvvwbt) && target_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = target_vvvvwbt;
+		var target_vvvvwbt = [];
+		target_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(target_vvvvwbt))
+	{
+		var target_vvvvwbt = [];
+	}
+	var target = target_vvvvwbt.some(target_vvvvwbt_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbt Some function
+function how_vvvvwbt_SomeFunc(how_vvvvwbt)
+{
+	// set the function logic
+	if (how_vvvvwbt == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbt Some function
+function target_vvvvwbt_SomeFunc(target_vvvvwbt)
+{
+	// set the function logic
+	if (target_vvvvwbt == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbu function
+function vvvvwbu(target_vvvvwbu,how_vvvvwbu)
+{
+	if (isSet(target_vvvvwbu) && target_vvvvwbu.constructor !== Array)
+	{
+		var temp_vvvvwbu = target_vvvvwbu;
+		var target_vvvvwbu = [];
+		target_vvvvwbu.push(temp_vvvvwbu);
+	}
+	else if (!isSet(target_vvvvwbu))
+	{
+		var target_vvvvwbu = [];
+	}
+	var target = target_vvvvwbu.some(target_vvvvwbu_SomeFunc);
+
+	if (isSet(how_vvvvwbu) && how_vvvvwbu.constructor !== Array)
+	{
+		var temp_vvvvwbu = how_vvvvwbu;
+		var how_vvvvwbu = [];
+		how_vvvvwbu.push(temp_vvvvwbu);
+	}
+	else if (!isSet(how_vvvvwbu))
+	{
+		var how_vvvvwbu = [];
+	}
+	var how = how_vvvvwbu.some(how_vvvvwbu_SomeFunc);
+
+
+	// set this function logic
+	if (target && how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbu Some function
+function target_vvvvwbu_SomeFunc(target_vvvvwbu)
+{
+	// set the function logic
+	if (target_vvvvwbu == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbu Some function
+function how_vvvvwbu_SomeFunc(how_vvvvwbu)
+{
+	// set the function logic
+	if (how_vvvvwbu == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbv function
+function vvvvwbv(how_vvvvwbv,target_vvvvwbv)
+{
+	if (isSet(how_vvvvwbv) && how_vvvvwbv.constructor !== Array)
+	{
+		var temp_vvvvwbv = how_vvvvwbv;
+		var how_vvvvwbv = [];
+		how_vvvvwbv.push(temp_vvvvwbv);
+	}
+	else if (!isSet(how_vvvvwbv))
+	{
+		var how_vvvvwbv = [];
+	}
+	var how = how_vvvvwbv.some(how_vvvvwbv_SomeFunc);
+
+	if (isSet(target_vvvvwbv) && target_vvvvwbv.constructor !== Array)
+	{
+		var temp_vvvvwbv = target_vvvvwbv;
+		var target_vvvvwbv = [];
+		target_vvvvwbv.push(temp_vvvvwbv);
+	}
+	else if (!isSet(target_vvvvwbv))
+	{
+		var target_vvvvwbv = [];
+	}
+	var target = target_vvvvwbv.some(target_vvvvwbv_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
+	{
+		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 vvvvwbv Some function
+function how_vvvvwbv_SomeFunc(how_vvvvwbv)
+{
+	// set the function logic
+	if (how_vvvvwbv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbv Some function
+function target_vvvvwbv_SomeFunc(target_vvvvwbv)
+{
+	// set the function logic
+	if (target_vvvvwbv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbw function
+function vvvvwbw(target_vvvvwbw,how_vvvvwbw)
+{
+	if (isSet(target_vvvvwbw) && target_vvvvwbw.constructor !== Array)
+	{
+		var temp_vvvvwbw = target_vvvvwbw;
+		var target_vvvvwbw = [];
+		target_vvvvwbw.push(temp_vvvvwbw);
+	}
+	else if (!isSet(target_vvvvwbw))
+	{
+		var target_vvvvwbw = [];
+	}
+	var target = target_vvvvwbw.some(target_vvvvwbw_SomeFunc);
+
+	if (isSet(how_vvvvwbw) && how_vvvvwbw.constructor !== Array)
+	{
+		var temp_vvvvwbw = how_vvvvwbw;
+		var how_vvvvwbw = [];
+		how_vvvvwbw.push(temp_vvvvwbw);
+	}
+	else if (!isSet(how_vvvvwbw))
+	{
+		var how_vvvvwbw = [];
+	}
+	var how = how_vvvvwbw.some(how_vvvvwbw_SomeFunc);
+
+
+	// set this function logic
+	if (target && 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 vvvvwbw Some function
+function target_vvvvwbw_SomeFunc(target_vvvvwbw)
+{
+	// set the function logic
+	if (target_vvvvwbw == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbw Some function
+function how_vvvvwbw_SomeFunc(how_vvvvwbw)
+{
+	// set the function logic
+	if (how_vvvvwbw == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbx function
+function vvvvwbx(how_vvvvwbx,target_vvvvwbx)
+{
+	if (isSet(how_vvvvwbx) && how_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = how_vvvvwbx;
+		var how_vvvvwbx = [];
+		how_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(how_vvvvwbx))
+	{
+		var how_vvvvwbx = [];
+	}
+	var how = how_vvvvwbx.some(how_vvvvwbx_SomeFunc);
+
+	if (isSet(target_vvvvwbx) && target_vvvvwbx.constructor !== Array)
+	{
+		var temp_vvvvwbx = target_vvvvwbx;
+		var target_vvvvwbx = [];
+		target_vvvvwbx.push(temp_vvvvwbx);
+	}
+	else if (!isSet(target_vvvvwbx))
+	{
+		var target_vvvvwbx = [];
+	}
+	var target = target_vvvvwbx.some(target_vvvvwbx_SomeFunc);
+
+
+	// set this function logic
+	if (how && target)
 	{
 		jQuery('.note_build_in_behaviour_one').closest('.control-group').show();
 		jQuery('.note_build_in_behaviour_three').closest('.control-group').show();
@@ -323,45 +626,173 @@ function vvvvwbr(how_vvvvwbr)
 	}
 }
 
-// the vvvvwbr Some function
+// the vvvvwbx Some function
-function how_vvvvwbr_SomeFunc(how_vvvvwbr)
+function how_vvvvwbx_SomeFunc(how_vvvvwbx)
 {
 	// set the function logic
-	if (how_vvvvwbr == 4)
+	if (how_vvvvwbx == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs function
+// the vvvvwbx Some function
-function vvvvwbs(type_vvvvwbs)
+function target_vvvvwbx_SomeFunc(target_vvvvwbx)
 {
 	// set the function logic
-	if (type_vvvvwbs == 2)
+	if (target_vvvvwbx == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwby function
+function vvvvwby(target_vvvvwby,how_vvvvwby)
+{
+	if (isSet(target_vvvvwby) && target_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = target_vvvvwby;
+		var target_vvvvwby = [];
+		target_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(target_vvvvwby))
+	{
+		var target_vvvvwby = [];
+	}
+	var target = target_vvvvwby.some(target_vvvvwby_SomeFunc);
+
+	if (isSet(how_vvvvwby) && how_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = how_vvvvwby;
+		var how_vvvvwby = [];
+		how_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(how_vvvvwby))
+	{
+		var how_vvvvwby = [];
+	}
+	var how = how_vvvvwby.some(how_vvvvwby_SomeFunc);
+
+
+	// set this function logic
+	if (target && how)
+	{
+		jQuery('.note_build_in_behaviour_one').closest('.control-group').show();
+		jQuery('.note_build_in_behaviour_three').closest('.control-group').show();
+		jQuery('.note_build_in_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_build_in_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_build_in_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_build_in_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwby Some function
+function target_vvvvwby_SomeFunc(target_vvvvwby)
+{
+	// set the function logic
+	if (target_vvvvwby == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwby Some function
+function how_vvvvwby_SomeFunc(how_vvvvwby)
+{
+	// set the function logic
+	if (how_vvvvwby == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbz function
+function vvvvwbz(target_vvvvwbz,type_vvvvwbz)
+{
+	// set the function logic
+	if (target_vvvvwbz == 1 && type_vvvvwbz == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwbsvxk_required)
+		if (jform_vvvvwbzvxk_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwbsvxk_required = false;
+			jform_vvvvwbzvxk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwbsvxk_required)
+		if (!jform_vvvvwbzvxk_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwbsvxk_required = true;
+			jform_vvvvwbzvxk_required = true;
+		}
+	}
+}
+
+// the vvvvwcb function
+function vvvvwcb(target_vvvvwcb)
+{
+	// set the function logic
+	if (target_vvvvwcb == 1)
+	{
+		jQuery('#jform_how').closest('.control-group').show();
+		// add required attribute to how field
+		if (jform_vvvvwcbvxl_required)
+		{
+			updateFieldRequired('how',0);
+			jQuery('#jform_how').prop('required','required');
+			jQuery('#jform_how').attr('aria-required',true);
+			jQuery('#jform_how').addClass('required');
+			jform_vvvvwcbvxl_required = false;
+		}
+		jQuery('#jform_type').closest('.control-group').show();
+		// add required attribute to type field
+		if (jform_vvvvwcbvxm_required)
+		{
+			updateFieldRequired('type',0);
+			jQuery('#jform_type').prop('required','required');
+			jQuery('#jform_type').attr('aria-required',true);
+			jQuery('#jform_type').addClass('required');
+			jform_vvvvwcbvxm_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_how').closest('.control-group').hide();
+		// remove required attribute from how field
+		if (!jform_vvvvwcbvxl_required)
+		{
+			updateFieldRequired('how',1);
+			jQuery('#jform_how').removeAttr('required');
+			jQuery('#jform_how').removeAttr('aria-required');
+			jQuery('#jform_how').removeClass('required');
+			jform_vvvvwcbvxl_required = true;
+		}
+		jQuery('#jform_type').closest('.control-group').hide();
+		// remove required attribute from type field
+		if (!jform_vvvvwcbvxm_required)
+		{
+			updateFieldRequired('type',1);
+			jQuery('#jform_type').removeAttr('required');
+			jQuery('#jform_type').removeAttr('aria-required');
+			jQuery('#jform_type').removeClass('required');
+			jform_vvvvwcbvxm_required = true;
 		}
 	}
 }

admin/models/forms/library.xml

@@ -101,22 +101,21 @@
 			message="COM_COMPONENTBUILDER_LIBRARY_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_LIBRARY_NAME_HINT"
 		/>
-		<!-- Description Field. Type: Text. (joomla) -->
+		<!-- Target Field. Type: Radio. (joomla) -->
 		<field
-			type="text"
+			type="radio"
-			name="description"
+			name="target"
-			label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL"
-			size="80"
+			description="COM_COMPONENTBUILDER_LIBRARY_TARGET_DESCRIPTION"
-			maxlength="150"
+			class="btn-group btn-group-yesno"
-			description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
+			default="1"
-			class="text_area"
+			required="true">
-			readonly="false"
+			<!-- Option Set. -->
-			disabled="false"
+			<option value="1">
-			required="false"
+				COM_COMPONENTBUILDER_LIBRARY_MEDIA</option>
-			filter="STRING"
+			<option value="2">
-			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
+				COM_COMPONENTBUILDER_LIBRARY_LIBRARIES</option>
-			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
+		</field>
-		/>
 		<!-- How Field. Type: Filebehaviour. (custom) -->
 		<field
 			type="filebehaviour"
@@ -144,26 +143,40 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_LIBRARY_BUNDLE</option>
 		</field>
+		<!-- Description Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="description"
+			label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
+			size="80"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="false"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
+		/>
 		<!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_build_in_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_two" />
-		<!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_two" />
 		<!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_yes_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_two" />
-		<!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_build_in_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_three" />
+		<field type="note" name="note_no_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_two" />
 		<!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_display_library_files_folders_urls" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION" class="note_display_library_files_folders_urls" />
+		<!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_build_in_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_three" />
+		<!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_three" />
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_three" />
-		<!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_display_library_config" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION" class="note_display_library_config" />
 		<!-- Libraries Field. Type: Librariesx. (custom) -->
 		<field
 			type="librariesx"
@@ -176,8 +189,8 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_one" />
+		<field type="note" name="note_display_library_config" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION" class="note_display_library_config" />
 		<!-- Php_setdocument Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -313,6 +326,8 @@
 		<field type="note" name="note_build_in_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_one" />
 		<!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_yes_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_one" />
+		<!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_one" />
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
 		<!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/server.js

@@ -9,56 +9,56 @@
  */
 
 // Some Global Values
-jform_vvvvwcsvxz_required = false;
+jform_vvvvwddvyj_required = false;
-jform_vvvvwcsvya_required = false;
+jform_vvvvwddvyk_required = false;
-jform_vvvvwcsvyb_required = false;
+jform_vvvvwddvyl_required = false;
-jform_vvvvwcsvyc_required = false;
+jform_vvvvwddvym_required = false;
-jform_vvvvwcsvyd_required = false;
+jform_vvvvwddvyn_required = false;
-jform_vvvvwctvye_required = false;
+jform_vvvvwdevyo_required = false;
-jform_vvvvwcuvyf_required = false;
+jform_vvvvwdfvyp_required = false;
-jform_vvvvwcwvyg_required = false;
+jform_vvvvwdhvyq_required = false;
-jform_vvvvwcyvyh_required = false;
+jform_vvvvwdjvyr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdd = jQuery("#jform_protocol").val();
-	vvvvwcs(protocol_vvvvwcs);
+	vvvvwdd(protocol_vvvvwdd);
 
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
+	var protocol_vvvvwde = jQuery("#jform_protocol").val();
-	vvvvwct(protocol_vvvvwct);
+	vvvvwde(protocol_vvvvwde);
 
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdf = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf);
 
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdh = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdh = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh);
 
-	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdj = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdj = jQuery("#jform_authentication").val();
-	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+	vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj);
 
-	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdl = jQuery("#jform_protocol").val();
-	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdl = jQuery("#jform_authentication").val();
-	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+	vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl);
 });
 
-// the vvvvwcs function
+// the vvvvwdd function
-function vvvvwcs(protocol_vvvvwcs)
+function vvvvwdd(protocol_vvvvwdd)
 {
-	if (isSet(protocol_vvvvwcs) && protocol_vvvvwcs.constructor !== Array)
+	if (isSet(protocol_vvvvwdd) && protocol_vvvvwdd.constructor !== Array)
 	{
-		var temp_vvvvwcs = protocol_vvvvwcs;
+		var temp_vvvvwdd = protocol_vvvvwdd;
-		var protocol_vvvvwcs = [];
+		var protocol_vvvvwdd = [];
-		protocol_vvvvwcs.push(temp_vvvvwcs);
+		protocol_vvvvwdd.push(temp_vvvvwdd);
 	}
-	else if (!isSet(protocol_vvvvwcs))
+	else if (!isSet(protocol_vvvvwdd))
 	{
-		var protocol_vvvvwcs = [];
+		var protocol_vvvvwdd = [];
 	}
-	var protocol = protocol_vvvvwcs.some(protocol_vvvvwcs_SomeFunc);
+	var protocol = protocol_vvvvwdd.some(protocol_vvvvwdd_SomeFunc);
 
 
 	// set this function logic
@@ -66,137 +66,137 @@ function vvvvwcs(protocol_vvvvwcs)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
 		// add required attribute to authentication field
-		if (jform_vvvvwcsvxz_required)
+		if (jform_vvvvwddvyj_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwcsvxz_required = false;
+			jform_vvvvwddvyj_required = false;
 		}
 		jQuery('#jform_host').closest('.control-group').show();
 		// add required attribute to host field
-		if (jform_vvvvwcsvya_required)
+		if (jform_vvvvwddvyk_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvwcsvya_required = false;
+			jform_vvvvwddvyk_required = false;
 		}
 		jQuery('#jform_port').closest('.control-group').show();
 		// add required attribute to port field
-		if (jform_vvvvwcsvyb_required)
+		if (jform_vvvvwddvyl_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvwcsvyb_required = false;
+			jform_vvvvwddvyl_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwcsvyc_required)
+		if (jform_vvvvwddvym_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwcsvyc_required = false;
+			jform_vvvvwddvym_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_vvvvwcsvyd_required)
+		if (jform_vvvvwddvyn_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvwcsvyd_required = false;
+			jform_vvvvwddvyn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
 		// remove required attribute from authentication field
-		if (!jform_vvvvwcsvxz_required)
+		if (!jform_vvvvwddvyj_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwcsvxz_required = true;
+			jform_vvvvwddvyj_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
 		// remove required attribute from host field
-		if (!jform_vvvvwcsvya_required)
+		if (!jform_vvvvwddvyk_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwcsvya_required = true;
+			jform_vvvvwddvyk_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
 		// remove required attribute from port field
-		if (!jform_vvvvwcsvyb_required)
+		if (!jform_vvvvwddvyl_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwcsvyb_required = true;
+			jform_vvvvwddvyl_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwcsvyc_required)
+		if (!jform_vvvvwddvym_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwcsvyc_required = true;
+			jform_vvvvwddvym_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_vvvvwcsvyd_required)
+		if (!jform_vvvvwddvyn_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwcsvyd_required = true;
+			jform_vvvvwddvyn_required = true;
 		}
 	}
 }
 
-// the vvvvwcs Some function
+// the vvvvwdd Some function
-function protocol_vvvvwcs_SomeFunc(protocol_vvvvwcs)
+function protocol_vvvvwdd_SomeFunc(protocol_vvvvwdd)
 {
 	// set the function logic
-	if (protocol_vvvvwcs == 2)
+	if (protocol_vvvvwdd == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwct function
+// the vvvvwde function
-function vvvvwct(protocol_vvvvwct)
+function vvvvwde(protocol_vvvvwde)
 {
-	if (isSet(protocol_vvvvwct) && protocol_vvvvwct.constructor !== Array)
+	if (isSet(protocol_vvvvwde) && protocol_vvvvwde.constructor !== Array)
 	{
-		var temp_vvvvwct = protocol_vvvvwct;
+		var temp_vvvvwde = protocol_vvvvwde;
-		var protocol_vvvvwct = [];
+		var protocol_vvvvwde = [];
-		protocol_vvvvwct.push(temp_vvvvwct);
+		protocol_vvvvwde.push(temp_vvvvwde);
 	}
-	else if (!isSet(protocol_vvvvwct))
+	else if (!isSet(protocol_vvvvwde))
 	{
-		var protocol_vvvvwct = [];
+		var protocol_vvvvwde = [];
 	}
-	var protocol = protocol_vvvvwct.some(protocol_vvvvwct_SomeFunc);
+	var protocol = protocol_vvvvwde.some(protocol_vvvvwde_SomeFunc);
 
 
 	// set this function logic
@@ -205,13 +205,13 @@ function vvvvwct(protocol_vvvvwct)
 		jQuery('.note_ftp_signature').closest('.control-group').show();
 		jQuery('#jform_signature').closest('.control-group').show();
 		// add required attribute to signature field
-		if (jform_vvvvwctvye_required)
+		if (jform_vvvvwdevyo_required)
 		{
 			updateFieldRequired('signature',0);
 			jQuery('#jform_signature').prop('required','required');
 			jQuery('#jform_signature').attr('aria-required',true);
 			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwctvye_required = false;
+			jform_vvvvwdevyo_required = false;
 		}
 	}
 	else
@@ -219,54 +219,54 @@ function vvvvwct(protocol_vvvvwct)
 		jQuery('.note_ftp_signature').closest('.control-group').hide();
 		jQuery('#jform_signature').closest('.control-group').hide();
 		// remove required attribute from signature field
-		if (!jform_vvvvwctvye_required)
+		if (!jform_vvvvwdevyo_required)
 		{
 			updateFieldRequired('signature',1);
 			jQuery('#jform_signature').removeAttr('required');
 			jQuery('#jform_signature').removeAttr('aria-required');
 			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwctvye_required = true;
+			jform_vvvvwdevyo_required = true;
 		}
 	}
 }
 
-// the vvvvwct Some function
+// the vvvvwde Some function
-function protocol_vvvvwct_SomeFunc(protocol_vvvvwct)
+function protocol_vvvvwde_SomeFunc(protocol_vvvvwde)
 {
 	// set the function logic
-	if (protocol_vvvvwct == 1)
+	if (protocol_vvvvwde == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcu function
+// the vvvvwdf function
-function vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu)
+function vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf)
 {
-	if (isSet(protocol_vvvvwcu) && protocol_vvvvwcu.constructor !== Array)
+	if (isSet(protocol_vvvvwdf) && protocol_vvvvwdf.constructor !== Array)
 	{
-		var temp_vvvvwcu = protocol_vvvvwcu;
+		var temp_vvvvwdf = protocol_vvvvwdf;
-		var protocol_vvvvwcu = [];
+		var protocol_vvvvwdf = [];
-		protocol_vvvvwcu.push(temp_vvvvwcu);
+		protocol_vvvvwdf.push(temp_vvvvwdf);
 	}
-	else if (!isSet(protocol_vvvvwcu))
+	else if (!isSet(protocol_vvvvwdf))
 	{
-		var protocol_vvvvwcu = [];
+		var protocol_vvvvwdf = [];
 	}
-	var protocol = protocol_vvvvwcu.some(protocol_vvvvwcu_SomeFunc);
+	var protocol = protocol_vvvvwdf.some(protocol_vvvvwdf_SomeFunc);
 
-	if (isSet(authentication_vvvvwcu) && authentication_vvvvwcu.constructor !== Array)
+	if (isSet(authentication_vvvvwdf) && authentication_vvvvwdf.constructor !== Array)
 	{
-		var temp_vvvvwcu = authentication_vvvvwcu;
+		var temp_vvvvwdf = authentication_vvvvwdf;
-		var authentication_vvvvwcu = [];
+		var authentication_vvvvwdf = [];
-		authentication_vvvvwcu.push(temp_vvvvwcu);
+		authentication_vvvvwdf.push(temp_vvvvwdf);
 	}
-	else if (!isSet(authentication_vvvvwcu))
+	else if (!isSet(authentication_vvvvwdf))
 	{
-		var authentication_vvvvwcu = [];
+		var authentication_vvvvwdf = [];
 	}
-	var authentication = authentication_vvvvwcu.some(authentication_vvvvwcu_SomeFunc);
+	var authentication = authentication_vvvvwdf.some(authentication_vvvvwdf_SomeFunc);
 
 
 	// set this function logic
@@ -274,78 +274,78 @@ function vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu)
 	{
 		jQuery('#jform_password').closest('.control-group').show();
 		// add required attribute to password field
-		if (jform_vvvvwcuvyf_required)
+		if (jform_vvvvwdfvyp_required)
 		{
 			updateFieldRequired('password',0);
 			jQuery('#jform_password').prop('required','required');
 			jQuery('#jform_password').attr('aria-required',true);
 			jQuery('#jform_password').addClass('required');
-			jform_vvvvwcuvyf_required = false;
+			jform_vvvvwdfvyp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_password').closest('.control-group').hide();
 		// remove required attribute from password field
-		if (!jform_vvvvwcuvyf_required)
+		if (!jform_vvvvwdfvyp_required)
 		{
 			updateFieldRequired('password',1);
 			jQuery('#jform_password').removeAttr('required');
 			jQuery('#jform_password').removeAttr('aria-required');
 			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwcuvyf_required = true;
+			jform_vvvvwdfvyp_required = true;
 		}
 	}
 }
 
-// the vvvvwcu Some function
+// the vvvvwdf Some function
-function protocol_vvvvwcu_SomeFunc(protocol_vvvvwcu)
+function protocol_vvvvwdf_SomeFunc(protocol_vvvvwdf)
 {
 	// set the function logic
-	if (protocol_vvvvwcu == 2)
+	if (protocol_vvvvwdf == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcu Some function
+// the vvvvwdf Some function
-function authentication_vvvvwcu_SomeFunc(authentication_vvvvwcu)
+function authentication_vvvvwdf_SomeFunc(authentication_vvvvwdf)
 {
 	// set the function logic
-	if (authentication_vvvvwcu == 1 || authentication_vvvvwcu == 3 || authentication_vvvvwcu == 5)
+	if (authentication_vvvvwdf == 1 || authentication_vvvvwdf == 3 || authentication_vvvvwdf == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcw function
+// the vvvvwdh function
-function vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw)
+function vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh)
 {
-	if (isSet(protocol_vvvvwcw) && protocol_vvvvwcw.constructor !== Array)
+	if (isSet(protocol_vvvvwdh) && protocol_vvvvwdh.constructor !== Array)
 	{
-		var temp_vvvvwcw = protocol_vvvvwcw;
+		var temp_vvvvwdh = protocol_vvvvwdh;
-		var protocol_vvvvwcw = [];
+		var protocol_vvvvwdh = [];
-		protocol_vvvvwcw.push(temp_vvvvwcw);
+		protocol_vvvvwdh.push(temp_vvvvwdh);
 	}
-	else if (!isSet(protocol_vvvvwcw))
+	else if (!isSet(protocol_vvvvwdh))
 	{
-		var protocol_vvvvwcw = [];
+		var protocol_vvvvwdh = [];
 	}
-	var protocol = protocol_vvvvwcw.some(protocol_vvvvwcw_SomeFunc);
+	var protocol = protocol_vvvvwdh.some(protocol_vvvvwdh_SomeFunc);
 
-	if (isSet(authentication_vvvvwcw) && authentication_vvvvwcw.constructor !== Array)
+	if (isSet(authentication_vvvvwdh) && authentication_vvvvwdh.constructor !== Array)
 	{
-		var temp_vvvvwcw = authentication_vvvvwcw;
+		var temp_vvvvwdh = authentication_vvvvwdh;
-		var authentication_vvvvwcw = [];
+		var authentication_vvvvwdh = [];
-		authentication_vvvvwcw.push(temp_vvvvwcw);
+		authentication_vvvvwdh.push(temp_vvvvwdh);
 	}
-	else if (!isSet(authentication_vvvvwcw))
+	else if (!isSet(authentication_vvvvwdh))
 	{
-		var authentication_vvvvwcw = [];
+		var authentication_vvvvwdh = [];
 	}
-	var authentication = authentication_vvvvwcw.some(authentication_vvvvwcw_SomeFunc);
+	var authentication = authentication_vvvvwdh.some(authentication_vvvvwdh_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwcwvyg_required)
+		if (jform_vvvvwdhvyq_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwcwvyg_required = false;
+			jform_vvvvwdhvyq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwcwvyg_required)
+		if (!jform_vvvvwdhvyq_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwcwvyg_required = true;
+			jform_vvvvwdhvyq_required = true;
 		}
 	}
 }
 
-// the vvvvwcw Some function
+// the vvvvwdh Some function
-function protocol_vvvvwcw_SomeFunc(protocol_vvvvwcw)
+function protocol_vvvvwdh_SomeFunc(protocol_vvvvwdh)
 {
 	// set the function logic
-	if (protocol_vvvvwcw == 2)
+	if (protocol_vvvvwdh == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcw Some function
+// the vvvvwdh Some function
-function authentication_vvvvwcw_SomeFunc(authentication_vvvvwcw)
+function authentication_vvvvwdh_SomeFunc(authentication_vvvvwdh)
 {
 	// set the function logic
-	if (authentication_vvvvwcw == 2 || authentication_vvvvwcw == 3)
+	if (authentication_vvvvwdh == 2 || authentication_vvvvwdh == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcy function
+// the vvvvwdj function
-function vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy)
+function vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj)
 {
-	if (isSet(protocol_vvvvwcy) && protocol_vvvvwcy.constructor !== Array)
+	if (isSet(protocol_vvvvwdj) && protocol_vvvvwdj.constructor !== Array)
 	{
-		var temp_vvvvwcy = protocol_vvvvwcy;
+		var temp_vvvvwdj = protocol_vvvvwdj;
-		var protocol_vvvvwcy = [];
+		var protocol_vvvvwdj = [];
-		protocol_vvvvwcy.push(temp_vvvvwcy);
+		protocol_vvvvwdj.push(temp_vvvvwdj);
 	}
-	else if (!isSet(protocol_vvvvwcy))
+	else if (!isSet(protocol_vvvvwdj))
 	{
-		var protocol_vvvvwcy = [];
+		var protocol_vvvvwdj = [];
 	}
-	var protocol = protocol_vvvvwcy.some(protocol_vvvvwcy_SomeFunc);
+	var protocol = protocol_vvvvwdj.some(protocol_vvvvwdj_SomeFunc);
 
-	if (isSet(authentication_vvvvwcy) && authentication_vvvvwcy.constructor !== Array)
+	if (isSet(authentication_vvvvwdj) && authentication_vvvvwdj.constructor !== Array)
 	{
-		var temp_vvvvwcy = authentication_vvvvwcy;
+		var temp_vvvvwdj = authentication_vvvvwdj;
-		var authentication_vvvvwcy = [];
+		var authentication_vvvvwdj = [];
-		authentication_vvvvwcy.push(temp_vvvvwcy);
+		authentication_vvvvwdj.push(temp_vvvvwdj);
 	}
-	else if (!isSet(authentication_vvvvwcy))
+	else if (!isSet(authentication_vvvvwdj))
 	{
-		var authentication_vvvvwcy = [];
+		var authentication_vvvvwdj = [];
 	}
-	var authentication = authentication_vvvvwcy.some(authentication_vvvvwcy_SomeFunc);
+	var authentication = authentication_vvvvwdj.some(authentication_vvvvwdj_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwcyvyh_required)
+		if (jform_vvvvwdjvyr_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_vvvvwcyvyh_required = false;
+			jform_vvvvwdjvyr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwcyvyh_required)
+		if (!jform_vvvvwdjvyr_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_vvvvwcyvyh_required = true;
+			jform_vvvvwdjvyr_required = true;
 		}
 	}
 }
 
-// the vvvvwcy Some function
+// the vvvvwdj Some function
-function protocol_vvvvwcy_SomeFunc(protocol_vvvvwcy)
+function protocol_vvvvwdj_SomeFunc(protocol_vvvvwdj)
 {
 	// set the function logic
-	if (protocol_vvvvwcy == 2)
+	if (protocol_vvvvwdj == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcy Some function
+// the vvvvwdj Some function
-function authentication_vvvvwcy_SomeFunc(authentication_vvvvwcy)
+function authentication_vvvvwdj_SomeFunc(authentication_vvvvwdj)
 {
 	// set the function logic
-	if (authentication_vvvvwcy == 4 || authentication_vvvvwcy == 5)
+	if (authentication_vvvvwdj == 4 || authentication_vvvvwdj == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwda function
+// the vvvvwdl function
-function vvvvwda(protocol_vvvvwda,authentication_vvvvwda)
+function vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl)
 {
-	if (isSet(protocol_vvvvwda) && protocol_vvvvwda.constructor !== Array)
+	if (isSet(protocol_vvvvwdl) && protocol_vvvvwdl.constructor !== Array)
 	{
-		var temp_vvvvwda = protocol_vvvvwda;
+		var temp_vvvvwdl = protocol_vvvvwdl;
-		var protocol_vvvvwda = [];
+		var protocol_vvvvwdl = [];
-		protocol_vvvvwda.push(temp_vvvvwda);
+		protocol_vvvvwdl.push(temp_vvvvwdl);
 	}
-	else if (!isSet(protocol_vvvvwda))
+	else if (!isSet(protocol_vvvvwdl))
 	{
-		var protocol_vvvvwda = [];
+		var protocol_vvvvwdl = [];
 	}
-	var protocol = protocol_vvvvwda.some(protocol_vvvvwda_SomeFunc);
+	var protocol = protocol_vvvvwdl.some(protocol_vvvvwdl_SomeFunc);
 
-	if (isSet(authentication_vvvvwda) && authentication_vvvvwda.constructor !== Array)
+	if (isSet(authentication_vvvvwdl) && authentication_vvvvwdl.constructor !== Array)
 	{
-		var temp_vvvvwda = authentication_vvvvwda;
+		var temp_vvvvwdl = authentication_vvvvwdl;
-		var authentication_vvvvwda = [];
+		var authentication_vvvvwdl = [];
-		authentication_vvvvwda.push(temp_vvvvwda);
+		authentication_vvvvwdl.push(temp_vvvvwdl);
 	}
-	else if (!isSet(authentication_vvvvwda))
+	else if (!isSet(authentication_vvvvwdl))
 	{
-		var authentication_vvvvwda = [];
+		var authentication_vvvvwdl = [];
 	}
-	var authentication = authentication_vvvvwda.some(authentication_vvvvwda_SomeFunc);
+	var authentication = authentication_vvvvwdl.some(authentication_vvvvwdl_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwda(protocol_vvvvwda,authentication_vvvvwda)
 	}
 }
 
-// the vvvvwda Some function
+// the vvvvwdl Some function
-function protocol_vvvvwda_SomeFunc(protocol_vvvvwda)
+function protocol_vvvvwdl_SomeFunc(protocol_vvvvwdl)
 {
 	// set the function logic
-	if (protocol_vvvvwda == 2)
+	if (protocol_vvvvwdl == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwda Some function
+// the vvvvwdl Some function
-function authentication_vvvvwda_SomeFunc(authentication_vvvvwda)
+function authentication_vvvvwdl_SomeFunc(authentication_vvvvwdl)
 {
 	// set the function logic
-	if (authentication_vvvvwda == 2 || authentication_vvvvwda == 3 || authentication_vvvvwda == 4 || authentication_vvvvwda == 5)
+	if (authentication_vvvvwdl == 2 || authentication_vvvvwdl == 3 || authentication_vvvvwdl == 4 || authentication_vvvvwdl == 5)
 	{
 		return true;
 	}

admin/models/joomla_components.php

@@ -1829,7 +1829,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 		),
 		// #__componentbuilder_field (i)
 		'field' => array(
-			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer'),
+			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer', 'on_save_model_field', 'on_get_model_field', 'initiator_on_save_model', 'initiator_on_get_model'),
 			'views' => 'fields',
 			'not_base64' => array('xml' => 'json'),
 			'base64_search' => array('xml' => array('start' => 'type_php', '_start' => '="', 'end' => '"')),

admin/models/libraries.php

@@ -28,8 +28,9 @@ class ComponentbuilderModelLibraries extends JModelList
 				'a.created_by','created_by',
 				'a.modified_by','modified_by',
 				'a.name','name',
-				'a.description','description',
+				'a.target','target',
 				'a.type','type',
+				'a.description','description',
 				'a.how','how'
 			);
 		}
@@ -54,12 +55,15 @@ class ComponentbuilderModelLibraries extends JModelList
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
 		$this->setState('filter.name', $name);
 
-		$description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description');
+		$target = $this->getUserStateFromRequest($this->context . '.filter.target', 'filter_target');
-		$this->setState('filter.description', $description);
+		$this->setState('filter.target', $target);
 
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
 		$this->setState('filter.type', $type);
 
+		$description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description');
+		$this->setState('filter.description', $description);
+
 		$how = $this->getUserStateFromRequest($this->context . '.filter.how', 'filter_how');
 		$this->setState('filter.how', $how);
         
@@ -128,6 +132,8 @@ class ComponentbuilderModelLibraries extends JModelList
 		{
 			foreach ($items as $nr => &$item)
 			{
+				// convert target
+				$item->target = $this->selectionTranslation($item->target, 'target');
 				// convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
 			}
@@ -145,6 +151,19 @@ class ComponentbuilderModelLibraries extends JModelList
 	 */
 	public function selectionTranslation($value,$name)
 	{
+		// Array of target language strings
+		if ($name === 'target')
+		{
+			$targetArray = array(
+				1 => 'COM_COMPONENTBUILDER_LIBRARY_MEDIA',
+				2 => 'COM_COMPONENTBUILDER_LIBRARY_LIBRARIES'
+			);
+			// Now check if value is found in this array
+			if (isset($targetArray[$value]) && ComponentbuilderHelper::checkString($targetArray[$value]))
+			{
+				return $targetArray[$value];
+			}
+		}
 		// Array of type language strings
 		if ($name === 'type')
 		{
@@ -238,6 +257,11 @@ class ComponentbuilderModelLibraries extends JModelList
 			}
 		}
 
+		// Filter by Target.
+		if ($target = $this->getState('filter.target'))
+		{
+			$query->where('a.target = ' . $db->quote($db->escape($target)));
+		}
 		// Filter by how.
 		if ($how = $this->getState('filter.how'))
 		{
@@ -276,8 +300,9 @@ class ComponentbuilderModelLibraries extends JModelList
 		$id .= ':' . $this->getState('filter.created_by');
 		$id .= ':' . $this->getState('filter.modified_by');
 		$id .= ':' . $this->getState('filter.name');
-		$id .= ':' . $this->getState('filter.description');
+		$id .= ':' . $this->getState('filter.target');
 		$id .= ':' . $this->getState('filter.type');
+		$id .= ':' . $this->getState('filter.description');
 		$id .= ':' . $this->getState('filter.how');
 
 		return parent::getStoreId($id);

admin/models/library.php

@@ -42,6 +42,7 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			),
 			'above' => array(
 				'name',
+				'target',
 				'how',
 				'type'
 			),

admin/models/server.php

@@ -189,7 +189,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVyilinked_components()
+	public function getVyslinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/sql/install.mysql.utf8.sql

@@ -803,6 +803,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_setdocument` MEDIUMTEXT NOT NULL,
+	`target` TINYINT(1) NOT NULL DEFAULT 1,
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`params` text NOT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -909,10 +910,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	`datatype` CHAR(64) NOT NULL DEFAULT '',
 	`fieldtype` INT(11) NOT NULL DEFAULT 0,
 	`indexes` CHAR(64) NOT NULL DEFAULT '',
+	`initiator_on_get_model` TEXT NOT NULL,
+	`initiator_on_save_model` TEXT NOT NULL,
 	`javascript_view_footer` TEXT NOT NULL,
 	`javascript_views_footer` TEXT NOT NULL,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`null_switch` CHAR(64) NOT NULL DEFAULT '',
+	`on_get_model_field` TEXT NOT NULL,
+	`on_save_model_field` TEXT NOT NULL,
 	`store` INT(11) NOT NULL DEFAULT 0,
 	`xml` TEXT NOT NULL,
 	`params` text NOT NULL,
@@ -934,14 +939,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	KEY `idx_indexes` (`indexes`),
 	KEY `idx_null_switch` (`null_switch`),
 	KEY `idx_catid` (`catid`),
-	KEY `idx_add_css_views` (`add_css_views`),
-	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_datalenght` (`datalenght`),
 	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
+	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
+	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_datadefault_other` (`datadefault_other`),
 	KEY `idx_datadefault` (`datadefault`),
 	KEY `idx_datalenght_other` (`datalenght_other`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
+	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_access` (`access`),
 	KEY `idx_checkout` (`checked_out`),
 	KEY `idx_createdby` (`created_by`),

admin/sql/updates/mysql/2.10.1.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_library` ADD `target` TINYINT(1) NOT NULL DEFAULT 1 AFTER `php_setdocument`;

admin/sql/updates/mysql/2.10.2.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `#__componentbuilder_field` ADD `on_get_model_field` TEXT NOT NULL AFTER `datatype`;
+
+ALTER TABLE `#__componentbuilder_field` ADD `on_save_model_field` TEXT NOT NULL AFTER `on_get_model_field`;
+
+ALTER TABLE `#__componentbuilder_field` ADD `initiator_on_save_model` TEXT NOT NULL AFTER `indexes`;
+
+ALTER TABLE `#__componentbuilder_field` ADD `initiator_on_get_model` TEXT NOT NULL AFTER `indexes`;

admin/views/field/tmpl/edit.php

@@ -147,172 +147,240 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwbt function
+// #jform_datalenght listeners for datalenght_vvvvwcc function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
-	vvvvwbt(datalenght_vvvvwbt);
+	vvvvwcc(datalenght_vvvvwcc);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbt = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcc = jQuery("#jform_datalenght").val();
-	vvvvwbt(datalenght_vvvvwbt);
+	vvvvwcc(datalenght_vvvvwcc);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwbu function
+// #jform_datadefault listeners for datadefault_vvvvwcd function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcd = jQuery("#jform_datadefault").val();
-	vvvvwbu(datadefault_vvvvwbu);
+	vvvvwcd(datadefault_vvvvwcd);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbu = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwcd = jQuery("#jform_datadefault").val();
-	vvvvwbu(datadefault_vvvvwbu);
+	vvvvwcd(datadefault_vvvvwcd);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbv function
+// #jform_datatype listeners for datatype_vvvvwce function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var datatype_vvvvwbv = jQuery("#jform_datatype").val();
+	var datatype_vvvvwce = jQuery("#jform_datatype").val();
-	vvvvwbv(datatype_vvvvwbv);
+	vvvvwce(datatype_vvvvwce);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbv = jQuery("#jform_datatype").val();
+	var datatype_vvvvwce = jQuery("#jform_datatype").val();
-	vvvvwbv(datatype_vvvvwbv);
+	vvvvwce(datatype_vvvvwce);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbw function
+// #jform_datatype listeners for datatype_vvvvwcf function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcf = jQuery("#jform_datatype").val();
-	vvvvwbw(datatype_vvvvwbw);
+	vvvvwcf(datatype_vvvvwcf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcf = jQuery("#jform_datatype").val();
-	vvvvwbw(datatype_vvvvwbw);
+	vvvvwcf(datatype_vvvvwcf);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbx function
+// #jform_datatype listeners for datatype_vvvvwcg function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	vvvvwbx(datatype_vvvvwbx);
+	vvvvwcg(datatype_vvvvwcg);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
+	var datatype_vvvvwcg = jQuery("#jform_datatype").val();
-	vvvvwbx(datatype_vvvvwbx);
+	vvvvwcg(datatype_vvvvwcg);
 
 });
 
-// #jform_store listeners for store_vvvvwby function
+// #jform_store listeners for store_vvvvwch function
 jQuery('#jform_store').on('keyup',function()
 {
-	var store_vvvvwby = jQuery("#jform_store").val();
+	var store_vvvvwch = jQuery("#jform_store").val();
-	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+	vvvvwch(store_vvvvwch,datatype_vvvvwch);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwby = jQuery("#jform_store").val();
+	var store_vvvvwch = jQuery("#jform_store").val();
-	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+	vvvvwch(store_vvvvwch,datatype_vvvvwch);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwby function
+// #jform_datatype listeners for datatype_vvvvwch function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwby = jQuery("#jform_store").val();
+	var store_vvvvwch = jQuery("#jform_store").val();
-	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+	vvvvwch(store_vvvvwch,datatype_vvvvwch);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwby = jQuery("#jform_store").val();
+	var store_vvvvwch = jQuery("#jform_store").val();
-	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+	vvvvwch(store_vvvvwch,datatype_vvvvwch);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwca function
+// #jform_store listeners for store_vvvvwcj function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwcj = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	vvvvwcj(store_vvvvwcj,datatype_vvvvwcj);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcj = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	vvvvwcj(store_vvvvwcj,datatype_vvvvwcj);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcj function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwcj = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	vvvvwcj(store_vvvvwcj,datatype_vvvvwcj);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcj = jQuery("#jform_store").val();
+	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
+	vvvvwcj(store_vvvvwcj,datatype_vvvvwcj);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwck function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var store_vvvvwck = jQuery("#jform_store").val();
+	vvvvwck(datatype_vvvvwck,store_vvvvwck);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var store_vvvvwck = jQuery("#jform_store").val();
+	vvvvwck(datatype_vvvvwck,store_vvvvwck);
+
+});
+
+// #jform_store listeners for store_vvvvwck function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var store_vvvvwck = jQuery("#jform_store").val();
+	vvvvwck(datatype_vvvvwck,store_vvvvwck);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var store_vvvvwck = jQuery("#jform_store").val();
+	vvvvwck(datatype_vvvvwck,store_vvvvwck);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwcl function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwcl = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwca(add_css_view_vvvvwca);
+	vvvvwcl(add_css_view_vvvvwcl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwcl = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwca(add_css_view_vvvvwca);
+	vvvvwcl(add_css_view_vvvvwcl);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwcb function
+// #jform_add_css_views listeners for add_css_views_vvvvwcm function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwcm = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwcb(add_css_views_vvvvwcb);
+	vvvvwcm(add_css_views_vvvvwcm);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwcm = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwcb(add_css_views_vvvvwcb);
+	vvvvwcm(add_css_views_vvvvwcm);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwcc function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwcn function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwcn = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_view_footer_vvvvwcc);
+	vvvvwcn(add_javascript_view_footer_vvvvwcn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwcn = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_view_footer_vvvvwcc);
+	vvvvwcn(add_javascript_view_footer_vvvvwcn);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwcd function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwco function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwco = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcd(add_javascript_views_footer_vvvvwcd);
+	vvvvwco(add_javascript_views_footer_vvvvwco);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwco = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcd(add_javascript_views_footer_vvvvwcd);
+	vvvvwco(add_javascript_views_footer_vvvvwco);
 
 });
 

admin/views/fieldtype/tmpl/edit.php

@@ -136,393 +136,393 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwce function
+// #jform_datalenght listeners for datalenght_vvvvwcp function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcp = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
+	vvvvwcp(datalenght_vvvvwcp,has_defaults_vvvvwcp);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwcp = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwce function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
-
-});
-
-// #jform_datadefault listeners for datadefault_vvvvwcg function
-jQuery('#jform_datadefault').on('keyup',function()
-{
-	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
-{
-	e.preventDefault();
-	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwcg function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwci function
-jQuery('#jform_datatype').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);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',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);
-
-});
-
-// #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);
-
-});
-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);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwck function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwck function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwck = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwcl function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcl function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcm function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_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 has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
-
-});
-
-// #jform_store listeners for store_vvvvwco function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwco function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwco function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwco = jQuery("#jform_store").val();
-	var datatype_vvvvwco = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcp function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+	vvvvwcp(datalenght_vvvvwcp,has_defaults_vvvvwcp);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
-
-});
-
-// #jform_store listeners for store_vvvvwcp function
-jQuery('#jform_store').on('keyup',function()
-{
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwcp function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var datalenght_vvvvwcp = jQuery("#jform_datalenght").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+	vvvvwcp(datalenght_vvvvwcp,has_defaults_vvvvwcp);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var datalenght_vvvvwcp = jQuery("#jform_datalenght").val();
-	var store_vvvvwcp = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+	vvvvwcp(datalenght_vvvvwcp,has_defaults_vvvvwcp);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwcq function
+// #jform_datadefault listeners for datadefault_vvvvwcr function
-jQuery('#jform_has_defaults').on('keyup',function()
+jQuery('#jform_datadefault').on('keyup',function()
 {
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datadefault_vvvvwcr = jQuery("#jform_datadefault").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcr(datadefault_vvvvwcr,has_defaults_vvvvwcr);
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
 
 });
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datadefault_vvvvwcr = jQuery("#jform_datadefault").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcr(datadefault_vvvvwcr,has_defaults_vvvvwcr);
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
-
-});
-
-// #jform_store listeners for store_vvvvwcq function
-jQuery('#jform_store').on('keyup',function()
-{
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcq function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcq = jQuery("#jform_store").val();
-	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
-	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwcr function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
+	var datadefault_vvvvwcr = jQuery("#jform_datadefault").val();
 	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcr(has_defaults_vvvvwcr);
+	vvvvwcr(datadefault_vvvvwcr,has_defaults_vvvvwcr);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
+	var datadefault_vvvvwcr = jQuery("#jform_datadefault").val();
 	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcr(has_defaults_vvvvwcr);
+	vvvvwcr(datadefault_vvvvwcr,has_defaults_vvvvwcr);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwct function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwct = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwct = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwct(datatype_vvvvwct,has_defaults_vvvvwct);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwct = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwct = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwct(datatype_vvvvwct,has_defaults_vvvvwct);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwct function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwct = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwct = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwct(datatype_vvvvwct,has_defaults_vvvvwct);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwct = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwct = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwct(datatype_vvvvwct,has_defaults_vvvvwct);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcv function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwcv = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcv = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcv(datatype_vvvvwcv,has_defaults_vvvvwcv);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcv = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcv = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcv(datatype_vvvvwcv,has_defaults_vvvvwcv);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcv function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwcv = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcv = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcv(datatype_vvvvwcv,has_defaults_vvvvwcv);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcv = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcv = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcv(datatype_vvvvwcv,has_defaults_vvvvwcv);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcw function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwcw = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcw = jQuery("#jform_datatype").val();
+	vvvvwcw(has_defaults_vvvvwcw,datatype_vvvvwcw);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcw = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcw = jQuery("#jform_datatype").val();
+	vvvvwcw(has_defaults_vvvvwcw,datatype_vvvvwcw);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcw function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwcw = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcw = jQuery("#jform_datatype").val();
+	vvvvwcw(has_defaults_vvvvwcw,datatype_vvvvwcw);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcw = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcw = jQuery("#jform_datatype").val();
+	vvvvwcw(has_defaults_vvvvwcw,datatype_vvvvwcw);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcx function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwcx = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcx = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcx(datatype_vvvvwcx,has_defaults_vvvvwcx);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcx = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcx = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcx(datatype_vvvvwcx,has_defaults_vvvvwcx);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcx function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwcx = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcx = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcx(datatype_vvvvwcx,has_defaults_vvvvwcx);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcx = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcx = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcx(datatype_vvvvwcx,has_defaults_vvvvwcx);
+
+});
+
+// #jform_store listeners for store_vvvvwcz function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcz function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcz function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwcz = jQuery("#jform_store").val();
+	var datatype_vvvvwcz = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwcz = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcz(store_vvvvwcz,datatype_vvvvwcz,has_defaults_vvvvwcz);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwda function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+
+// #jform_store listeners for store_vvvvwda function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwda function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwda = jQuery("#jform_datatype").val();
+	var store_vvvvwda = jQuery("#jform_store").val();
+	var has_defaults_vvvvwda = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwda(datatype_vvvvwda,store_vvvvwda,has_defaults_vvvvwda);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwdb function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+
+// #jform_store listeners for store_vvvvwdb function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwdb function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwdb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwdb = jQuery("#jform_store").val();
+	var datatype_vvvvwdb = jQuery("#jform_datatype").val();
+	vvvvwdb(has_defaults_vvvvwdb,store_vvvvwdb,datatype_vvvvwdb);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwdc function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwdc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwdc(has_defaults_vvvvwdc);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwdc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwdc(has_defaults_vvvvwdc);
 
 });
 

admin/views/fieldtype/view.html.php

@@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vxyfields = $this->get('Vxyfields');
+		$this->vyifields = $this->get('Vyifields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/help_document/tmpl/edit.php

@@ -116,93 +116,93 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwdc function
+// #jform_location listeners for location_vvvvwdn function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdn = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdc(location_vvvvwdc);
+	vvvvwdn(location_vvvvwdn);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdn = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdc(location_vvvvwdc);
+	vvvvwdn(location_vvvvwdn);
 
 });
 
-// #jform_location listeners for location_vvvvwdd function
+// #jform_location listeners for location_vvvvwdo function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdo = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdd(location_vvvvwdd);
+	vvvvwdo(location_vvvvwdo);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwdo = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwdd(location_vvvvwdd);
+	vvvvwdo(location_vvvvwdo);
 
 });
 
-// #jform_type listeners for type_vvvvwde function
+// #jform_type listeners for type_vvvvwdp function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwde = jQuery("#jform_type").val();
+	var type_vvvvwdp = jQuery("#jform_type").val();
-	vvvvwde(type_vvvvwde);
+	vvvvwdp(type_vvvvwdp);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwde = jQuery("#jform_type").val();
+	var type_vvvvwdp = jQuery("#jform_type").val();
-	vvvvwde(type_vvvvwde);
+	vvvvwdp(type_vvvvwdp);
 
 });
 
-// #jform_type listeners for type_vvvvwdf function
+// #jform_type listeners for type_vvvvwdq function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwdf = jQuery("#jform_type").val();
+	var type_vvvvwdq = jQuery("#jform_type").val();
-	vvvvwdf(type_vvvvwdf);
+	vvvvwdq(type_vvvvwdq);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwdf = jQuery("#jform_type").val();
+	var type_vvvvwdq = jQuery("#jform_type").val();
-	vvvvwdf(type_vvvvwdf);
+	vvvvwdq(type_vvvvwdq);
 
 });
 
-// #jform_type listeners for type_vvvvwdg function
+// #jform_type listeners for type_vvvvwdr function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwdg = jQuery("#jform_type").val();
+	var type_vvvvwdr = jQuery("#jform_type").val();
-	vvvvwdg(type_vvvvwdg);
+	vvvvwdr(type_vvvvwdr);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwdg = jQuery("#jform_type").val();
+	var type_vvvvwdr = jQuery("#jform_type").val();
-	vvvvwdg(type_vvvvwdg);
+	vvvvwdr(type_vvvvwdr);
 
 });
 
-// #jform_target listeners for target_vvvvwdh function
+// #jform_target listeners for target_vvvvwds function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwds = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwdh(target_vvvvwdh);
+	vvvvwds(target_vvvvwds);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwds = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwdh(target_vvvvwdh);
+	vvvvwds(target_vvvvwds);
 
 });
 

admin/views/libraries/tmpl/default_body.php

@@ -104,7 +104,7 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 			</div>
 		</td>
 		<td class="hidden-phone">
-			<?php echo $this->escape($item->description); ?>
+			<?php echo JText::_($item->target); ?>
 		</td>
 		<td class="hidden-phone">
 			<?php echo $this->escape($item->how); ?>
@@ -112,6 +112,9 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
 		<td class="hidden-phone">
 			<?php echo JText::_($item->type); ?>
 		</td>
+		<td class="hidden-phone">
+			<?php echo $this->escape($item->description); ?>
+		</td>
 		<td class="center">
 		<?php if ($canDo->get('library.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>

admin/views/libraries/tmpl/default_foot.php

@@ -14,5 +14,5 @@ defined('_JEXEC') or die('Restricted access');
 
 ?>
 <tr>
-	<td colspan="8"><?php echo $this->pagination->getListFooter(); ?></td>
+	<td colspan="9"><?php echo $this->pagination->getListFooter(); ?></td>
 </tr>

admin/views/libraries/tmpl/default_head.php

@@ -33,7 +33,7 @@ defined('_JEXEC') or die('Restricted access');
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL', 'name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL', 'description', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL', 'target', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo JText::_('COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL'); ?>
@@ -41,6 +41,9 @@ defined('_JEXEC') or die('Restricted access');
 	<th class="nowrap hidden-phone" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL', 'type', $this->listDirn, $this->listOrder); ?>
 	</th>
+	<th class="nowrap hidden-phone" >
+			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL', 'description', $this->listDirn, $this->listOrder); ?>
+	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LIBRARY_STATUS', 'published', $this->listDirn, $this->listOrder); ?>

admin/views/libraries/view.html.php

@@ -181,6 +181,36 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 			);
 		}
 
+		// Set Target Selection
+		$this->targetOptions = $this->getTheTargetSelections();
+		// We do some sanitation for Target filter
+		if (ComponentbuilderHelper::checkArray($this->targetOptions) &&
+			isset($this->targetOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
+		{
+			unset($this->targetOptions[0]);
+		}
+		// Only load Target filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->targetOptions))
+		{
+			// Target Filter
+			JHtmlSidebar::addFilter(
+				'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL').' -',
+				'filter_target',
+				JHtml::_('select.options', $this->targetOptions, 'value', 'text', $this->state->get('filter.target'))
+			);
+
+			if ($this->canBatch && $this->canCreate && $this->canEdit)
+			{
+				// Target Batch Selection
+				JHtmlBatch_::addListSelection(
+					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL').' -',
+					'batch[target]',
+					JHtml::_('select.options', $this->targetOptions, 'value', 'text')
+				);
+			}
+		}
+
 		// Set How Selection
 		$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
 		// We do some sanitation for How filter
@@ -286,12 +316,49 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 			'a.sorting' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL'),
-			'a.description' => JText::_('COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL'),
+			'a.target' => JText::_('COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL'),
 			'a.type' => JText::_('COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL'),
+			'a.description' => JText::_('COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);
 	}
 
+	protected function getTheTargetSelections()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('target'));
+		$query->from($db->quoteName('#__componentbuilder_library'));
+		$query->order($db->quoteName('target') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get model
+			$model = $this->getModel();
+			$results = array_unique($results);
+			$_filter = array();
+			foreach ($results as $target)
+			{
+				// Translate the target selection
+				$text = $model->selectionTranslation($target,'target');
+				// Now add the target and its text to the options array
+				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+
 	protected function getTheTypeSelections()
 	{
 		// Get a db connection.

admin/views/library/tmpl/edit.php

@@ -150,29 +150,33 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 jQuery('#jform_how').on('keyup',function()
 {
 	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbl(how_vvvvwbl);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_how',function (e)
 {
 	e.preventDefault();
 	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbl(how_vvvvwbl);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
 
 });
 
-// #jform_how listeners for how_vvvvwbm function
+// #jform_target listeners for target_vvvvwbl function
-jQuery('#jform_how').on('keyup',function()
+jQuery('#jform_target').on('keyup',function()
 {
-	var how_vvvvwbm = jQuery("#jform_how").val();
+	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbm(how_vvvvwbm);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
 
 });
-jQuery('#adminForm').on('change', '#jform_how',function (e)
+jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var how_vvvvwbm = jQuery("#jform_how").val();
+	var how_vvvvwbl = jQuery("#jform_how").val();
-	vvvvwbm(how_vvvvwbm);
+	var target_vvvvwbl = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbl(how_vvvvwbl,target_vvvvwbl);
 
 });
 
@@ -180,29 +184,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 jQuery('#jform_how').on('keyup',function()
 {
 	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbn(how_vvvvwbn);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
 
 });
 jQuery('#adminForm').on('change', '#jform_how',function (e)
 {
 	e.preventDefault();
 	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbn(how_vvvvwbn);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
 
 });
 
-// #jform_how listeners for how_vvvvwbo function
+// #jform_target listeners for target_vvvvwbn function
-jQuery('#jform_how').on('keyup',function()
+jQuery('#jform_target').on('keyup',function()
 {
-	var how_vvvvwbo = jQuery("#jform_how").val();
+	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbo(how_vvvvwbo);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
 
 });
-jQuery('#adminForm').on('change', '#jform_how',function (e)
+jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var how_vvvvwbo = jQuery("#jform_how").val();
+	var how_vvvvwbn = jQuery("#jform_how").val();
-	vvvvwbo(how_vvvvwbo);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(how_vvvvwbn,target_vvvvwbn);
 
 });
 
@@ -210,29 +218,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 jQuery('#jform_how').on('keyup',function()
 {
 	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbp(how_vvvvwbp);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
 
 });
 jQuery('#adminForm').on('change', '#jform_how',function (e)
 {
 	e.preventDefault();
 	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbp(how_vvvvwbp);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
 
 });
 
-// #jform_how listeners for how_vvvvwbq function
+// #jform_target listeners for target_vvvvwbp function
-jQuery('#jform_how').on('keyup',function()
+jQuery('#jform_target').on('keyup',function()
 {
-	var how_vvvvwbq = jQuery("#jform_how").val();
+	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbq(how_vvvvwbq);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
 
 });
-jQuery('#adminForm').on('change', '#jform_how',function (e)
+jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var how_vvvvwbq = jQuery("#jform_how").val();
+	var how_vvvvwbp = jQuery("#jform_how").val();
-	vvvvwbq(how_vvvvwbq);
+	var target_vvvvwbp = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbp(how_vvvvwbp,target_vvvvwbp);
 
 });
 
@@ -240,29 +252,286 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 jQuery('#jform_how').on('keyup',function()
 {
 	var how_vvvvwbr = jQuery("#jform_how").val();
-	vvvvwbr(how_vvvvwbr);
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
 
 });
 jQuery('#adminForm').on('change', '#jform_how',function (e)
 {
 	e.preventDefault();
 	var how_vvvvwbr = jQuery("#jform_how").val();
-	vvvvwbr(how_vvvvwbr);
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
 
 });
 
-// #jform_type listeners for type_vvvvwbs function
+// #jform_target listeners for target_vvvvwbr function
+jQuery('#jform_target').on('keyup',function()
+{
+	var how_vvvvwbr = jQuery("#jform_how").val();
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbr = jQuery("#jform_how").val();
+	var target_vvvvwbr = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbr(how_vvvvwbr,target_vvvvwbr);
+
+});
+
+// #jform_how listeners for how_vvvvwbt function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwbt = jQuery("#jform_how").val();
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbt = jQuery("#jform_how").val();
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+});
+
+// #jform_target listeners for target_vvvvwbt function
+jQuery('#jform_target').on('keyup',function()
+{
+	var how_vvvvwbt = jQuery("#jform_how").val();
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbt = jQuery("#jform_how").val();
+	var target_vvvvwbt = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbt(how_vvvvwbt,target_vvvvwbt);
+
+});
+
+// #jform_target listeners for target_vvvvwbu function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+});
+
+// #jform_how listeners for how_vvvvwbu function
+jQuery('#jform_how').on('keyup',function()
+{
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbu = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbu = jQuery("#jform_how").val();
+	vvvvwbu(target_vvvvwbu,how_vvvvwbu);
+
+});
+
+// #jform_how listeners for how_vvvvwbv function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+});
+
+// #jform_target listeners for target_vvvvwbv function
+jQuery('#jform_target').on('keyup',function()
+{
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbv = jQuery("#jform_how").val();
+	var target_vvvvwbv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbv(how_vvvvwbv,target_vvvvwbv);
+
+});
+
+// #jform_target listeners for target_vvvvwbw function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+});
+
+// #jform_how listeners for how_vvvvwbw function
+jQuery('#jform_how').on('keyup',function()
+{
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbw = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwbw = jQuery("#jform_how").val();
+	vvvvwbw(target_vvvvwbw,how_vvvvwbw);
+
+});
+
+// #jform_how listeners for how_vvvvwbx function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+});
+
+// #jform_target listeners for target_vvvvwbx function
+jQuery('#jform_target').on('keyup',function()
+{
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwbx = jQuery("#jform_how").val();
+	var target_vvvvwbx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbx(how_vvvvwbx,target_vvvvwbx);
+
+});
+
+// #jform_target listeners for target_vvvvwby function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+});
+
+// #jform_how listeners for how_vvvvwby function
+jQuery('#jform_how').on('keyup',function()
+{
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwby = jQuery("#jform_target input[type='radio']:checked").val();
+	var how_vvvvwby = jQuery("#jform_how").val();
+	vvvvwby(target_vvvvwby,how_vvvvwby);
+
+});
+
+// #jform_target listeners for target_vvvvwbz function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
+
+});
+
+// #jform_type listeners for type_vvvvwbz function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbs(type_vvvvwbs);
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbs = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwbz = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbs(type_vvvvwbs);
+	var type_vvvvwbz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwbz(target_vvvvwbz,type_vvvvwbz);
+
+});
+
+// #jform_target listeners for target_vvvvwcb function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvwcb = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcb(target_vvvvwcb);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwcb = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcb(target_vvvvwcb);
 
 });
 

admin/views/server/tmpl/edit.php

@@ -125,169 +125,169 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwcs function
+// #jform_protocol listeners for protocol_vvvvwdd function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdd = jQuery("#jform_protocol").val();
-	vvvvwcs(protocol_vvvvwcs);
+	vvvvwdd(protocol_vvvvwdd);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdd = jQuery("#jform_protocol").val();
-	vvvvwcs(protocol_vvvvwcs);
+	vvvvwdd(protocol_vvvvwdd);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwct function
+// #jform_protocol listeners for protocol_vvvvwde function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
+	var protocol_vvvvwde = jQuery("#jform_protocol").val();
-	vvvvwct(protocol_vvvvwct);
+	vvvvwde(protocol_vvvvwde);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
+	var protocol_vvvvwde = jQuery("#jform_protocol").val();
-	vvvvwct(protocol_vvvvwct);
+	vvvvwde(protocol_vvvvwde);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcu function
+// #jform_protocol listeners for protocol_vvvvwdf function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdf = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdf = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcu function
+// #jform_authentication listeners for authentication_vvvvwdf function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdf = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdf = jQuery("#jform_authentication").val();
-	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
+	vvvvwdf(protocol_vvvvwdf,authentication_vvvvwdf);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcw function
+// #jform_protocol listeners for protocol_vvvvwdh function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdh = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdh = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdh = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdh = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcw function
+// #jform_authentication listeners for authentication_vvvvwdh function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdh = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdh = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdh = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdh = jQuery("#jform_authentication").val();
-	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+	vvvvwdh(protocol_vvvvwdh,authentication_vvvvwdh);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcy function
+// #jform_protocol listeners for protocol_vvvvwdj function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdj = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdj = jQuery("#jform_authentication").val();
-	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+	vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdj = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdj = jQuery("#jform_authentication").val();
-	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+	vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcy function
+// #jform_authentication listeners for authentication_vvvvwdj function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdj = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdj = jQuery("#jform_authentication").val();
-	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+	vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdj = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdj = jQuery("#jform_authentication").val();
-	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+	vvvvwdj(protocol_vvvvwdj,authentication_vvvvwdj);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwda function
+// #jform_protocol listeners for protocol_vvvvwdl function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdl = jQuery("#jform_protocol").val();
-	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdl = jQuery("#jform_authentication").val();
-	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+	vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdl = jQuery("#jform_protocol").val();
-	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdl = jQuery("#jform_authentication").val();
-	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+	vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwda function
+// #jform_authentication listeners for authentication_vvvvwdl function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdl = jQuery("#jform_protocol").val();
-	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdl = jQuery("#jform_authentication").val();
-	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+	vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var protocol_vvvvwdl = jQuery("#jform_protocol").val();
-	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	var authentication_vvvvwdl = jQuery("#jform_authentication").val();
-	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+	vvvvwdl(protocol_vvvvwdl,authentication_vvvvwdl);
 
 });
 

admin/views/server/view.html.php

@@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vyilinked_components = $this->get('Vyilinked_components');
+		$this->vyslinked_components = $this->get('Vyslinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

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>14th October, 2019</creationDate>
+	<creationDate>16th October, 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.10.1</version>
+	<version>2.10.4</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.10.1)</h1>
+		<h1>Component Builder (v.2.10.4)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -815,4 +815,38 @@
 		<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.10.2</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.10.4/JCB_v2.10.4.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.10.4</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.10.4/JCB_v2.10.4.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>
 </updates>

libraries/phpseclib/vendor/composer/installed.json

@@ -1,17 +1,17 @@
 [
     {
         "name": "phpseclib/phpseclib",
-        "version": "2.0.21",
+        "version": "2.0.23",
-        "version_normalized": "2.0.21.0",
+        "version_normalized": "2.0.23.0",
         "source": {
             "type": "git",
             "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d"
+            "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d",
+            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
-            "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d",
+            "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099",
             "shasum": ""
         },
         "require": {
@@ -29,7 +29,7 @@
             "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
             "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
         },
-        "time": "2019-07-12T12:53:49+00:00",
+        "time": "2019-09-17T03:41:22+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

libraries/phpseclib/vendor/phpseclib/phpseclib/BACKERS.md

@@ -0,0 +1,7 @@
+# Backers
+
+phpseclib ongoing development is made possible by [Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme) and by contributions by users like you. Thank you.
+
+## Backers
+
+- Zane Hooper

libraries/phpseclib/vendor/phpseclib/phpseclib/README.md

@@ -45,7 +45,7 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 * Composer compatible (PSR-0 autoloading)
 * Install using Composer: `composer require phpseclib/phpseclib:~1.0`
 * Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm)
-* [Download 1.0.16 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.16.zip/download)
+* [Download 1.0.17 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.17.zip/download)
 
 ## Security contact information
 

libraries/phpseclib/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php

@@ -702,7 +702,14 @@ class ASN1
                 return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content'];
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
-                if (isset($mapping['implicit'])) {
+                // for explicitly tagged optional stuff
+                if (is_array($decoded['content'])) {
+                    $decoded['content'] = $decoded['content'][0]['content'];
+                }
+                // for implicitly tagged optional stuff
+                // in theory, doing isset($mapping['implicit']) would work but malformed certs do exist
+                // in the wild that OpenSSL decodes without issue so we'll support them as well
+                if (!is_object($decoded['content'])) {
                     $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']);
                 }
                 return $decoded['content'] ? $decoded['content']->format($this->format) : false;
@@ -843,7 +850,7 @@ class ASN1
                     if ($mapping['type'] == self::TYPE_SET) {
                         sort($value);
                     }
-                    $value = implode($value, '');
+                    $value = implode('', $value);
                     break;
                 }
 

libraries/phpseclib/vendor/phpseclib/phpseclib/phpseclib/File/X509.php

@@ -963,6 +963,13 @@ class X509
             'children' => $AccessDescription
         );
 
+        $this->SubjectInfoAccessSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AccessDescription
+        );
+
         $this->SubjectAltName = $GeneralNames;
 
         $this->PrivateKeyUsagePeriod = array(
@@ -1620,7 +1627,10 @@ class X509
                    corresponding to the extension type identified by extnID */
                 $map = $this->_getMapping($id);
                 if (!is_bool($map)) {
-                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => array($this, '_decodeIP')));
+                    $decoder = $id == 'id-ce-nameConstraints' ?
+                        array($this, '_decodeNameConstraintIP') :
+                        array($this, '_decodeIP');
+                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => $decoder));
                     $value = $mapped === false ? $decoded[0] : $mapped;
 
                     if ($id == 'id-ce-certificatePolicies') {
@@ -1889,6 +1899,8 @@ class X509
                 return $this->ExtKeyUsageSyntax;
             case 'id-pe-authorityInfoAccess':
                 return $this->AuthorityInfoAccessSyntax;
+            case 'id-pe-subjectInfoAccess':
+                return $this->SubjectInfoAccessSyntax;
             case 'id-ce-subjectAltName':
                 return $this->SubjectAltName;
             case 'id-ce-subjectDirectoryAttributes':
@@ -2511,18 +2523,38 @@ class X509
         return inet_ntop(base64_decode($ip));
     }
 
+    /**
+     * Decodes an IP address in a name constraints extension
+     *
+     * Takes in a base64 encoded "blob" and returns a human readable IP address / mask
+     *
+     * @param string $ip
+     * @access private
+     * @return array
+     */
+    function _decodeNameConstraintIP($ip)
+    {
+        $ip = base64_decode($ip);
+        $size = strlen($ip) >> 1;
+        $mask = substr($ip, $size);
+        $ip = substr($ip, 0, $size);
+        return array(inet_ntop($ip), inet_ntop($mask));
+    }
+
     /**
      * Encodes an IP address
      *
      * Takes a human readable IP address into a base64-encoded "blob"
      *
-     * @param string $ip
+     * @param string|array $ip
      * @access private
      * @return string
      */
     function _encodeIP($ip)
     {
-        return base64_encode(inet_pton($ip));
+        return is_string($ip) ?
+            base64_encode(inet_pton($ip)) :
+            base64_encode(inet_pton($ip[0]) . inet_pton($ip[1]));
     }
 
     /**

libraries/phpseclib/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php

@@ -545,7 +545,7 @@ class BigInteger
                 $bytes = chr(0);
             }
 
-            if (ord($bytes[0]) & 0x80) {
+            if ($this->precision <= 0 && (ord($bytes[0]) & 0x80)) {
                 $bytes = chr(0) . $bytes;
             }
 
@@ -707,6 +707,7 @@ class BigInteger
         }
 
         $temp = $this->copy();
+        $temp->bitmask = false;
         $temp->is_negative = false;
 
         $divisor = new static();
@@ -843,7 +844,7 @@ class BigInteger
             $opts[] = 'OpenSSL';
         }
         if (!empty($opts)) {
-            $engine.= ' (' . implode($opts, ', ') . ')';
+            $engine.= ' (' . implode('.', $opts) . ')';
         }
         return array(
             'value' => '0x' . $this->toHex(true),
@@ -3569,7 +3570,14 @@ class BigInteger
         switch (MATH_BIGINTEGER_MODE) {
             case self::MODE_GMP:
                 if ($this->bitmask !== false) {
+                    $flip = gmp_cmp($result->value, gmp_init(0)) < 0;
+                    if ($flip) {
+                        $result->value = gmp_neg($result->value);
+                    }
                     $result->value = gmp_and($result->value, $result->bitmask->value);
+                    if ($flip) {
+                        $result->value = gmp_neg($result->value);
+                    }
                 }
 
                 return $result;

libraries/phpseclib/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php

@@ -410,6 +410,7 @@ class SFTP extends SSH2
     function login($username)
     {
         $args = func_get_args();
+        $this->auth[] = $args;
         if (!call_user_func_array(array(&$this, '_login'), $args)) {
             return false;
         }
@@ -2975,6 +2976,20 @@ class SFTP extends SSH2
         return $result;
     }
 
+    /**
+     * Resets a connection for re-use
+     *
+     * @param int $reason
+     * @access private
+     */
+    function _reset_connection($reason)
+    {
+        parent::_reset_connection($reason);
+        $this->use_request_id = false;
+        $this->pwd = false;
+        $this->requestBuffer = array();
+    }
+
     /**
      * Receives SFTP Packets
      *

libraries/phpseclib/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php

@@ -209,6 +209,15 @@ class SSH2
      */
     var $kex_algorithms = false;
 
+    /**
+     * Key Exchange Algorithm
+     *
+     * @see self::getMethodsNegotiated()
+     * @var string|false
+     * @access private
+     */
+    var $kex_algorithm = false;
+
     /**
      * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
@@ -317,6 +326,15 @@ class SSH2
      */
     var $languages_client_to_server = false;
 
+    /**
+     * Preferred Algorithms
+     *
+     * @see self::setPreferredAlgorithms()
+     * @var array
+     * @access private
+     */
+    var $preferred = array();
+
     /**
      * Block Size for Server to Client Encryption
      *
@@ -898,14 +916,6 @@ class SSH2
      */
     var $bad_key_size_fix = false;
 
-    /**
-     * The selected decryption algorithm
-     *
-     * @var string
-     * @access private
-     */
-    var $decrypt_algorithm = '';
-
     /**
      * Should we try to re-connect to re-establish keys?
      *
@@ -1280,7 +1290,7 @@ class SSH2
         $identifier = 'SSH-2.0-phpseclib_2.0';
 
         $ext = array();
-        if (function_exists('\\Sodium\\library_version_major')) {
+        if (function_exists('sodium_crypto_box_publickey_from_secretkey')) {
             $ext[] = 'libsodium';
         }
 
@@ -1311,141 +1321,59 @@ class SSH2
      */
     function _key_exchange($kexinit_payload_server = false)
     {
-        $kex_algorithms = array(
+        $preferred = $this->preferred;
-            // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
-            // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
-            // libssh repository for more information.
-            'curve25519-sha256@libssh.org',
 
-            // Diffie-Hellman Key Agreement (DH) using integer modulo prime
+        $kex_algorithms = isset($preferred['kex']) ?
-            // groups.
+            $preferred['kex'] :
-            'diffie-hellman-group1-sha1', // REQUIRED
+            $this->getSupportedKEXAlgorithms();
-            'diffie-hellman-group14-sha1', // REQUIRED
+        $server_host_key_algorithms = isset($preferred['hostkey']) ?
-            'diffie-hellman-group-exchange-sha1', // RFC 4419
+            $preferred['hostkey'] :
-            'diffie-hellman-group-exchange-sha256', // RFC 4419
+            $this->getSupportedHostKeyAlgorithms();
-        );
+        $s2c_encryption_algorithms = isset($preferred['server_to_client']['crypt']) ?
-        if (!function_exists('\\Sodium\\library_version_major')) {
+            $preferred['server_to_client']['crypt'] :
-            $kex_algorithms = array_diff(
+            $this->getSupportedEncryptionAlgorithms();
-                $kex_algorithms,
+        $c2s_encryption_algorithms = isset($preferred['client_to_server']['crypt']) ?
-                array('curve25519-sha256@libssh.org')
+            $preferred['client_to_server']['crypt'] :
-            );
+            $this->getSupportedEncryptionAlgorithms();
-        }
+        $s2c_mac_algorithms = isset($preferred['server_to_client']['mac']) ?
-
+            $preferred['server_to_client']['mac'] :
-        $server_host_key_algorithms = array(
+            $this->getSupportedMACAlgorithms();
-            'rsa-sha2-256', // RFC 8332
+        $c2s_mac_algorithms = isset($preferred['client_to_server']['mac']) ?
-            'rsa-sha2-512', // RFC 8332
+            $preferred['client_to_server']['mac'] :
-            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
+            $this->getSupportedMACAlgorithms();
-            'ssh-dss'  // REQUIRED     sign   Raw DSS Key
+        $s2c_compression_algorithms = isset($preferred['server_to_client']['comp']) ?
-        );
+            $preferred['server_to_client']['comp'] :
-
+            $this->getSupportedCompressionAlgorithms();
-        $encryption_algorithms = array(
+        $c2s_compression_algorithms = isset($preferred['client_to_server']['comp']) ?
-            // from <http://tools.ietf.org/html/rfc4345#section-4>:
+            $preferred['client_to_server']['comp'] :
-            'arcfour256',
+            $this->getSupportedCompressionAlgorithms();
-            'arcfour128',
-
-            //'arcfour',      // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
-
-            // CTR modes from <http://tools.ietf.org/html/rfc4344#section-4>:
-            'aes128-ctr',     // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
-            'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
-            'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
-
-            'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
-            'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
-            'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
-
-            'aes128-cbc',     // RECOMMENDED       AES with a 128-bit key
-            'aes192-cbc',     // OPTIONAL          AES with a 192-bit key
-            'aes256-cbc',     // OPTIONAL          AES in CBC mode, with a 256-bit key
-
-            'twofish128-cbc', // OPTIONAL          Twofish with a 128-bit key
-            'twofish192-cbc', // OPTIONAL          Twofish with a 192-bit key
-            'twofish256-cbc',
-            'twofish-cbc',    // OPTIONAL          alias for "twofish256-cbc"
-                              //                   (this is being retained for historical reasons)
-
-            'blowfish-ctr',   // OPTIONAL          Blowfish in SDCTR mode
-
-            'blowfish-cbc',   // OPTIONAL          Blowfish in CBC mode
-
-            '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
-
-            '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
-                //'none'         // OPTIONAL          no encryption; NOT RECOMMENDED
-        );
-
-        if (extension_loaded('openssl') && !extension_loaded('mcrypt')) {
-            // OpenSSL does not support arcfour256 in any capacity and arcfour128 / arcfour support is limited to
-            // instances that do not use continuous buffers
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
-        }
-
-        if (class_exists('\phpseclib\Crypt\RC4') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Rijndael') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Twofish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Blowfish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('blowfish-ctr', 'blowfish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\TripleDES') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('3des-ctr', '3des-cbc')
-            );
-        }
-        $encryption_algorithms = array_values($encryption_algorithms);
-
-        $mac_algorithms = array(
-            // from <http://www.ietf.org/rfc/rfc6668.txt>:
-            'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
-
-            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
-            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
-            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
-            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
-            //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
-        );
-
-        $compression_algorithms = array(
-            'none'   // REQUIRED        no compression
-            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
-        );
 
         // some SSH servers have buggy implementations of some of the above algorithms
         switch (true) {
             case $this->server_identifier == 'SSH-2.0-SSHD':
             case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK':
-                $mac_algorithms = array_values(array_diff(
+                if (!isset($preferred['server_to_client']['mac'])) {
-                    $mac_algorithms,
+                    $s2c_mac_algorithms = array_values(array_diff(
-                    array('hmac-sha1-96', 'hmac-md5-96')
+                        $s2c_mac_algorithms,
-                ));
+                        array('hmac-sha1-96', 'hmac-md5-96')
+                    ));
+                }
+                if (!isset($preferred['client_to_server']['mac'])) {
+                    $c2s_mac_algorithms = array_values(array_diff(
+                        $c2s_mac_algorithms,
+                        array('hmac-sha1-96', 'hmac-md5-96')
+                    ));
+                }
         }
 
         $str_kex_algorithms = implode(',', $kex_algorithms);
         $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
-        $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
+        $encryption_algorithms_server_to_client = implode(',', $s2c_encryption_algorithms);
-        $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
+        $encryption_algorithms_client_to_server = implode(',', $c2s_encryption_algorithms);
-        $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
+        $mac_algorithms_server_to_client = implode(',', $s2c_mac_algorithms);
+        $mac_algorithms_client_to_server = implode(',', $c2s_mac_algorithms);
+        $compression_algorithms_server_to_client = implode(',', $s2c_compression_algorithms);
+        $compression_algorithms_client_to_server = implode(',', $c2s_compression_algorithms);
 
         $client_cookie = Random::string(16);
 
@@ -1572,14 +1500,14 @@ class SSH2
         // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
         // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
         // diffie-hellman key exchange as fast as possible
-        $decrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_server_to_client);
+        $decrypt = $this->_array_intersect_first($s2c_encryption_algorithms, $this->encryption_algorithms_server_to_client);
         $decryptKeyLength = $this->_encryption_algorithm_to_key_size($decrypt);
         if ($decryptKeyLength === null) {
             user_error('No compatible server to client encryption algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
         }
 
-        $encrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_client_to_server);
+        $encrypt = $this->_array_intersect_first($c2s_encryption_algorithms, $this->encryption_algorithms_client_to_server);
         $encryptKeyLength = $this->_encryption_algorithm_to_key_size($encrypt);
         if ($encryptKeyLength === null) {
             user_error('No compatible client to server encryption algorithms found');
@@ -1587,7 +1515,7 @@ class SSH2
         }
 
         // through diffie-hellman key exchange a symmetric key is obtained
-        $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms);
+        $this->kex_algorithm = $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms);
         if ($kex_algorithm === false) {
             user_error('No compatible key exchange algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
@@ -1598,7 +1526,7 @@ class SSH2
 
         if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
             $x = Random::string(32);
-            $eBytes = \Sodium\crypto_box_publickey_from_secretkey($x);
+            $eBytes = sodium_crypto_box_publickey_from_secretkey($x);
             $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT;
             $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY;
             $kexHash = new Hash('sha256');
@@ -1770,8 +1698,8 @@ class SSH2
                 user_error('Received curve25519 public key of invalid length.');
                 return false;
             }
-            $key = new BigInteger(\Sodium\crypto_scalarmult($x, $fBytes), 256);
+            $key = new BigInteger(sodium_crypto_scalarmult($x, $fBytes), 256);
-            \Sodium\memzero($x);
+            sodium_memzero($x);
         } else {
             $f = new BigInteger($fBytes, -256);
             $key = $f->modPow($x, $prime);
@@ -1859,8 +1787,6 @@ class SSH2
             return false;
         }
 
-        $this->decrypt_algorithm = $decrypt;
-
         $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
 
         $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
@@ -1874,6 +1800,10 @@ class SSH2
             $this->encrypt->enableContinuousBuffer();
             $this->encrypt->disablePadding();
 
+            if ($this->encrypt->getBlockLength()) {
+                $this->encrypt_block_size = $this->encrypt->getBlockLength() >> 3;
+            }
+
             $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
             while ($this->encrypt_block_size > strlen($iv)) {
                 $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
@@ -1885,6 +1815,8 @@ class SSH2
                 $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
             }
             $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
+
+            $this->encrypt->name = $decrypt;
         }
 
         $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
@@ -1898,6 +1830,10 @@ class SSH2
             $this->decrypt->enableContinuousBuffer();
             $this->decrypt->disablePadding();
 
+            if ($this->decrypt->getBlockLength()) {
+                $this->decrypt_block_size = $this->decrypt->getBlockLength() >> 3;
+            }
+
             $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
             while ($this->decrypt_block_size > strlen($iv)) {
                 $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
@@ -1909,6 +1845,8 @@ class SSH2
                 $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
             }
             $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
+
+            $this->decrypt->name = $decrypt;
         }
 
         /* The "arcfour128" algorithm is the RC4 cipher, as described in
@@ -1925,7 +1863,7 @@ class SSH2
             $this->decrypt->decrypt(str_repeat("\0", 1536));
         }
 
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_client_to_server);
+        $mac_algorithm = $this->_array_intersect_first($c2s_mac_algorithms, $this->mac_algorithms_client_to_server);
         if ($mac_algorithm === false) {
             user_error('No compatible client to server message authentication algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
@@ -1953,8 +1891,9 @@ class SSH2
                 $this->hmac_create = new Hash('md5-96');
                 $createKeyLength = 16;
         }
+        $this->hmac_create->name = $mac_algorithm;
 
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_server_to_client);
+        $mac_algorithm = $this->_array_intersect_first($s2c_mac_algorithms, $this->mac_algorithms_server_to_client);
         if ($mac_algorithm === false) {
             user_error('No compatible server to client message authentication algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
@@ -1988,6 +1927,7 @@ class SSH2
                 $checkKeyLength = 16;
                 $this->hmac_size = 12;
         }
+        $this->hmac_check->name = $mac_algorithm;
 
         $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
         while ($createKeyLength > strlen($key)) {
@@ -2001,19 +1941,19 @@ class SSH2
         }
         $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
 
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_server_to_client);
+        $compression_algorithm = $this->_array_intersect_first($c2s_compression_algorithms, $this->compression_algorithms_client_to_server);
-        if ($compression_algorithm === false) {
-            user_error('No compatible server to client compression algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-        $this->decompress = $compression_algorithm == 'zlib';
-
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_client_to_server);
         if ($compression_algorithm === false) {
             user_error('No compatible client to server compression algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
         }
-        $this->compress = $compression_algorithm == 'zlib';
+        //$this->decompress = $compression_algorithm == 'zlib';
+
+        $compression_algorithm = $this->_array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_client_to_server);
+        if ($compression_algorithm === false) {
+            user_error('No compatible server to client compression algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+        //$this->compress = $compression_algorithm == 'zlib';
 
         return true;
     }
@@ -2105,7 +2045,7 @@ class SSH2
         return null;
     }
 
-    /*
+    /**
      * Tests whether or not proposed algorithm has a potential for issues
      *
      * @link https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-aesctr-openssh.html
@@ -3266,6 +3206,9 @@ class SSH2
     function ping()
     {
         if (!$this->isAuthenticated()) {
+            if (!empty($this->auth)) {
+                return $this->_reconnect();
+            }
             return false;
         }
 
@@ -3376,7 +3319,7 @@ class SSH2
         // "implementations SHOULD check that the packet length is reasonable"
         // PuTTY uses 0x9000 as the actual max packet size and so to shall we
         if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decrypt_algorithm) && !($this->bitmap & SSH2::MASK_LOGIN)) {
+            if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decrypt->name) && !($this->bitmap & SSH2::MASK_LOGIN)) {
                 $this->bad_key_size_fix = true;
                 $this->_reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
                 return false;
@@ -4173,10 +4116,14 @@ class SSH2
         if ($this->bitmap & self::MASK_CONNECTED) {
             $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
             $this->_send_binary_packet($data);
-            $this->bitmap = 0;
-            fclose($this->fsock);
-            return false;
         }
+
+        $this->bitmap = 0;
+        if (is_resource($this->fsock) && get_resource_type($this->fsock) == 'stream') {
+            fclose($this->fsock);
+        }
+
+        return false;
     }
 
     /**
@@ -4497,6 +4444,309 @@ class SSH2
         return $this->languages_client_to_server;
     }
 
+    /**
+     * Returns a list of algorithms the server supports
+     *
+     * @return array
+     * @access public
+     */
+    public function getServerAlgorithms()
+    {
+        $this->_connect();
+
+        return array(
+            'kex' => $this->kex_algorithms,
+            'hostkey' => $this->server_host_key_algorithms,
+            'client_to_server' => array(
+                'crypt' => $this->encryption_algorithms_client_to_server,
+                'mac' => $this->mac_algorithms_client_to_server,
+                'comp' => $this->compression_algorithms_client_to_server,
+                'lang' => $this->languages_client_to_server
+            ),
+            'server_to_client' => array(
+                'crypt' => $this->encryption_algorithms_server_to_client,
+                'mac' => $this->mac_algorithms_server_to_client,
+                'comp' => $this->compression_algorithms_server_to_client,
+                'lang' => $this->languages_server_to_client
+            )
+        );
+    }
+
+    /**
+     * Returns a list of KEX algorithms that phpseclib supports
+     *
+     * @return array
+     * @access public
+     */
+    function getSupportedKEXAlgorithms()
+    {
+        $kex_algorithms = array(
+            // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
+            // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
+            // libssh repository for more information.
+            'curve25519-sha256@libssh.org',
+
+            'diffie-hellman-group-exchange-sha256',// RFC 4419
+            'diffie-hellman-group-exchange-sha1',  // RFC 4419
+
+            // Diffie-Hellman Key Agreement (DH) using integer modulo prime
+            // groups.
+            'diffie-hellman-group14-sha1', // REQUIRED
+            'diffie-hellman-group1-sha1', // REQUIRED
+        );
+
+        if (!function_exists('sodium_crypto_box_publickey_from_secretkey')) {
+            $kex_algorithms = array_diff(
+                $kex_algorithms,
+                array('curve25519-sha256@libssh.org')
+            );
+        }
+
+        return $kex_algorithms;
+    }
+
+    /**
+     * Returns a list of host key algorithms that phpseclib supports
+     *
+     * @return array
+     * @access public
+     */
+    function getSupportedHostKeyAlgorithms()
+    {
+        return array(
+            'rsa-sha2-256', // RFC 8332
+            'rsa-sha2-512', // RFC 8332
+            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
+            'ssh-dss'  // REQUIRED     sign   Raw DSS Key
+        );
+    }
+
+    /**
+     * Returns a list of symmetric key algorithms that phpseclib supports
+     *
+     * @return array
+     * @access public
+     */
+    function getSupportedEncryptionAlgorithms()
+    {
+        $algos = array(
+            // from <http://tools.ietf.org/html/rfc4345#section-4>:
+            'arcfour256',
+            'arcfour128',
+
+            //'arcfour',      // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
+
+            // CTR modes from <http://tools.ietf.org/html/rfc4344#section-4>:
+            'aes128-ctr',     // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
+            'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
+            'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
+
+            'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
+            'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
+            'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
+
+            'aes128-cbc',     // RECOMMENDED       AES with a 128-bit key
+            'aes192-cbc',     // OPTIONAL          AES with a 192-bit key
+            'aes256-cbc',     // OPTIONAL          AES in CBC mode, with a 256-bit key
+
+            'twofish128-cbc', // OPTIONAL          Twofish with a 128-bit key
+            'twofish192-cbc', // OPTIONAL          Twofish with a 192-bit key
+            'twofish256-cbc',
+            'twofish-cbc',    // OPTIONAL          alias for "twofish256-cbc"
+                              //                   (this is being retained for historical reasons)
+
+            'blowfish-ctr',   // OPTIONAL          Blowfish in SDCTR mode
+
+            'blowfish-cbc',   // OPTIONAL          Blowfish in CBC mode
+
+            '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
+
+            '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
+
+             //'none'           // OPTIONAL          no encryption; NOT RECOMMENDED
+        );
+
+        $engines = array(
+            Base::ENGINE_OPENSSL,
+            Base::ENGINE_MCRYPT,
+            Base::ENGINE_INTERNAL
+        );
+
+        $ciphers = array();
+        foreach ($engines as $engine) {
+            foreach ($algos as $algo) {
+                $obj = $this->_encryption_algorithm_to_crypt_instance($algo);
+                if ($obj instanceof Rijndael) {
+                    $obj->setKeyLength(preg_replace('#[^\d]#', '', $algo));
+                }
+                switch ($algo) {
+                    case 'arcfour128':
+                    case 'arcfour256':
+                        if ($engine == Base::ENGINE_INTERNAL) {
+                            $algos = array_diff($algos, array($algo));
+                            $ciphers[] = $algo;
+                        } else {
+                            continue 2;
+                        }
+                }
+                if ($obj->isValidEngine($engine)) {
+                    $algos = array_diff($algos, array($algo));
+                    $ciphers[] = $algo;
+                }
+            }
+        }
+
+        return $ciphers;
+    }
+
+    /**
+     * Returns a list of MAC algorithms that phpseclib supports
+     *
+     * @return array
+     * @access public
+     */
+    function getSupportedMACAlgorithms()
+    {
+        return array(
+            // from <http://www.ietf.org/rfc/rfc6668.txt>:
+            'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
+
+            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
+            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
+            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
+            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
+            //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
+        );
+    }
+
+    /**
+     * Returns a list of compression algorithms that phpseclib supports
+     *
+     * @return array
+     * @access public
+     */
+    function getSupportedCompressionAlgorithms()
+    {
+        return array(
+            'none'   // REQUIRED        no compression
+            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
+        );
+    }
+
+    /**
+     * Return list of negotiated algorithms
+     *
+     * Uses the same format as https://www.php.net/ssh2-methods-negotiated
+     *
+     * @return array
+     * @access public
+     */
+    function getAlgorithmsNegotiated()
+    {
+        $this->_connect();
+
+        return array(
+            'kex' => $this->kex_algorithm,
+            'hostkey' => $this->signature_format,
+            'client_to_server' => array(
+                'crypt' => $this->encrypt->name,
+                'mac' => $this->hmac_create->name,
+                'comp' => 'none',
+            ),
+            'server_to_client' => array(
+                'crypt' => $this->decrypt->name,
+                'mac' => $this->hmac_check->name,
+                'comp' => 'none',
+            )
+        );
+    }
+
+    /**
+     * Accepts an associative array with up to four parameters as described at
+     * <https://www.php.net/manual/en/function.ssh2-connect.php>
+     *
+     * @param array $methods
+     * @access public
+     */
+    function setPreferredAlgorithms($methods)
+    {
+        $preferred = $methods;
+
+        if (isset($preferred['kex'])) {
+            $preferred['kex'] = array_intersect(
+                $preferred['kex'],
+                $this->getSupportedKEXAlgorithms()
+            );
+        }
+
+        if (isset($preferred['hostkey'])) {
+            $preferred['hostkey'] = array_intersect(
+                $preferred['hostkey'],
+                $this->getSupportedHostKeyAlgorithms()
+            );
+        }
+
+        $keys = array('client_to_server', 'server_to_client');
+        foreach ($keys as $key) {
+            if (isset($preferred[$key])) {
+                $a = &$preferred[$key];
+                if (isset($a['crypt'])) {
+                    $a['crypt'] = array_intersect(
+                        $a['crypt'],
+                        $this->getSupportedEncryptionAlgorithms()
+                    );
+                }
+                if (isset($a['comp'])) {
+                    $a['comp'] = array_intersect(
+                        $a['comp'],
+                        $this->getSupportedCompressionAlgorithms()
+                    );
+                }
+                if (isset($a['mac'])) {
+                    $a['mac'] = array_intersect(
+                        $a['mac'],
+                        $this->getSupportedMACAlgorithms()
+                    );
+                }
+            }
+        }
+
+        $keys = array(
+            'kex',
+            'hostkey',
+            'client_to_server/crypt',
+            'client_to_server/comp',
+            'client_to_server/mac',
+            'server_to_client/crypt',
+            'server_to_client/comp',
+            'server_to_client/mac',
+        );
+        foreach ($keys as $key) {
+            $p = $preferred;
+            $m = $methods;
+
+            $subkeys = explode('/', $key);
+            foreach ($subkeys as $subkey) {
+                if (!isset($p[$subkey])) {
+                    continue 2;
+                }
+                $p = $p[$subkey];
+                $m = $m[$subkey];
+            }
+
+            if (count($p) != count($m)) {
+                $diff = array_diff($m, $p);
+                $msg = count($diff) == 1 ?
+                    ' is not a supported algorithm' :
+                    ' are not supported algorithms';
+                user_error(implode(', ', $diff) . $msg);
+                return false;
+            }
+        }
+
+        $this->preferred = $preferred;
+    }
+
     /**
      * Returns the banner message.
      *

script.php

@@ -5184,9 +5184,9 @@ class com_componentbuilderInstallerScript
 			$library->type_title = 'Componentbuilder Library';
 			$library->type_alias = 'com_componentbuilder.library';
 			$library->table = '{"special": {"dbtable": "#__componentbuilder_library","key": "id","type": "Library","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
+			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","target":"target","how":"how","type":"type","description":"description","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
 			$library->router = 'ComponentbuilderHelperRoute::getLibraryRoute';
-			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","how","type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
+			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","target","how","type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$library_Inserted = $db->insertObject('#__content_types', $library);
@@ -5220,9 +5220,9 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_views","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","on_get_model_field":"on_get_model_field","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","add_css_views":"add_css_views","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_css_view":"add_css_view","css_view":"css_view","not_required":"not_required","css_views":"css_views","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","initiator_on_save_model":"initiator_on_save_model","xml":"xml"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
-			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_css_views","add_css_view","add_javascript_views_footer","add_javascript_view_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
+			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_javascript_views_footer","add_javascript_view_footer","add_css_views","add_css_view"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$field_Inserted = $db->insertObject('#__content_types', $field);
@@ -6477,9 +6477,9 @@ class com_componentbuilderInstallerScript
 			$library->type_title = 'Componentbuilder Library';
 			$library->type_alias = 'com_componentbuilder.library';
 			$library->table = '{"special": {"dbtable": "#__componentbuilder_library","key": "id","type": "Library","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","description":"description","how":"how","type":"type","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
+			$library->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","target":"target","how":"how","type":"type","description":"description","not_required":"not_required","libraries":"libraries","php_setdocument":"php_setdocument"}}';
 			$library->router = 'ComponentbuilderHelperRoute::getLibraryRoute';
-			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","how","type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
+			$library->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/library.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","target","how","type","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if library type is already in content_type DB.
 			$library_id = null;
@@ -6564,9 +6564,9 @@ class com_componentbuilderInstallerScript
 			$field->type_title = 'Componentbuilder Field';
 			$field->type_alias = 'com_componentbuilder.field';
 			$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_views","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","css_views":"css_views","add_css_views":"add_css_views","css_view":"css_view","add_css_view":"add_css_view","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_javascript_view_footer":"add_javascript_view_footer","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
+			$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "css_view","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","store":"store","on_get_model_field":"on_get_model_field","on_save_model_field":"on_save_model_field","initiator_on_get_model":"initiator_on_get_model","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","add_css_views":"add_css_views","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","add_css_view":"add_css_view","css_view":"css_view","not_required":"not_required","css_views":"css_views","javascript_view_footer":"javascript_view_footer","javascript_views_footer":"javascript_views_footer","initiator_on_save_model":"initiator_on_save_model","xml":"xml"}}';
 			$field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
-			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_css_views","add_css_view","add_javascript_views_footer","add_javascript_view_footer"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
+			$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","store","catid","add_javascript_views_footer","add_javascript_view_footer","add_css_views","add_css_view"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if field type is already in content_type DB.
 			$field_id = null;
@@ -7634,10 +7634,18 @@ class com_componentbuilderInstallerScript
 				// set a notice that this was done
 				$app->enqueueMessage('<p><b>Best Practice!</b><br />We have removed the composer-vendor folder from the /administrator/components/com_componentbuilder/helpers/ folder and placed it in the /libraries/vdm_io/ folder.</p>', 'Notice');
 			}
+			// check if this install has the libraries in the helper folder, if so remove it
+			$vendorPath = JPATH_ROOT . '/libraries/vdm_io';
+			if (JFolder::exists($vendorPath))
+			{
+				ComponentbuilderHelper::removeFolder($vendorPath);
+				// set a notice that this was done
+				$app->enqueueMessage('<p><b>Best Practice!</b><br />We have removed the internal JCB composer-vendor folder <b>/libraries/vdm_io/</b> and placed the targeted library (phpseclib) in its own folder <b>/libraries/phpseclib/</b>.</p>', 'Notice');
+			}
 			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.10.1 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.10.4 Was Successful! Let us know if anything is not working as expected.</h3>';
 
 			// Create the componentbuilder action logs extensions object.
 			$componentbuilder_action_logs_extensions = new stdClass();

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

@@ -55,6 +55,7 @@ COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE="No component details found, so it is not safe to continue!"
 COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
+COM_COMPONENTBUILDER_NO_VALID_MODE_HAS_BEEN_SPECIFIED="No valid mode has been specified!"
 COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET="Owner details was set"
 COM_COMPONENTBUILDER_OWNER_S="Owner: %s"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details"
@@ -72,7 +73,7 @@ COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_
 COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>phpseclib\NET\SFTP</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info"
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_PATH_ON_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> path on <b>%s</b> server."
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> server."
-COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info!"
+COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESPHPSECLIBVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/phpseclib/vendor</b> folder. Please contact your system administrator for more info!"
 COM_COMPONENTBUILDER_THE_FTP_CONNECTION_FOR_BSB_COULD_NOT_BE_MADE_PLEASE_CHECK_YOUR_SIGNATURE_DETAILS="The FTP connection for <b>%s</b> could not be made. Please check your signature details!"
 COM_COMPONENTBUILDER_THE_FTP_SIGNATURE_FOR_BSB_WAS_NOT_WELL_FORMED_PLEASE_CHECK_YOUR_SIGNATURE_DETAILS="The FTP signature for <b>%s</b> was not well formed, please check your signature details!"
 COM_COMPONENTBUILDER_THE_LOGIN_TO_BSB_HAS_FAILED_PLEASE_CHECK_THAT_YOUR_DETAILS_ARE_CORRECT="The login to <b>%s</b> has failed, please check that your details are correct!"