Removed required from all code/editor field to improve the behavior of the codemirror editor. Improved the token validation via Ajax.

README.md

@@ -146,11 +146,11 @@ 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*: 6th July, 2019
++ *Last Build*: 8th July, 2019
 + *Version*: 2.9.21
 + *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*: **211603**
++ *Line count*: **210080**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**

admin/README.txt

@@ -146,11 +146,11 @@ 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*: 6th July, 2019
++ *Last Build*: 8th July, 2019
 + *Version*: 2.9.21
 + *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*: **211603**
++ *Line count*: **210080**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**

admin/assets/js/get_snippets.js

@@ -386,16 +386,16 @@ function bulkSnippetGithub(status) {
 function doBulkUpdate_server(path, status) {
 	// set the ajax scope
 	ajaxcall = null;
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json&raw=true");
 	if (token.length > 0 && path.length > 0 && status.length > 0) {
-		var request = 'token='+token+'&path='+path+'&status='+status;
+		var request = token+'=1&path='+path+'&status='+status;
 	}
 	return jQuery.ajax({
 		type: 'POST',
 		url: getUrl,
-		dataType: 'jsonp',
+		dataType: 'json',
 		data: request,
-		jsonp: 'callback'
+		jsonp: false
 	});
 }
 
@@ -423,16 +423,16 @@ function setSnippetGithub(key, status) {
 function setSnippetGithub_server(path, status) {
 	// set the ajax scope
 	ajaxcall = null;
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json&raw=true");
 	if (token.length > 0 && path.length > 0 && status.length > 0) {
-		var request = 'token='+token+'&path='+path+'&status='+status;
+		var request = token+'=1&path='+path+'&status='+status;
 	}
 	return jQuery.ajax({
 		type: 'POST',
 		url: getUrl,
-		dataType: 'jsonp',
+		dataType: 'json',
 		data: request,
-		jsonp: 'callback'
+		jsonp: false
 	});
 }
 

admin/compiler/joomla_3/JControllerLegacyAjax.php

@@ -39,7 +39,7 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($token == $call_token)
+		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
 			$task = $this->getTask();
 			switch($task)

admin/compiler/joomla_3/JControllerLegacyAjaxSite.php

@@ -39,7 +39,7 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($token == $call_token)
+		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
 			$task = $this->getTask();
 			switch($task)

admin/controllers/ajax.json.php

@@ -67,7 +67,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($token == $call_token)
+		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
 			$task = $this->getTask();
 			switch($task)

admin/helpers/componentbuilder.php

@@ -124,6 +124,65 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* get the method code
+	*
+	* @input	int       The method ID
+	*
+	* @returns string on success
+	**/
+	public static function getMethodCode($id)
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.comment','a.name','a.visibility','a.params','a.code')));
+		$query->from($db->quoteName('#__componentbuilder_method','a'));
+		$query->where($db->quoteName('a.id') . ' = ' . (int) $id);
+		// Implement View Level Access
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_method');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{
+			// get the method
+			$method = $db->loadObject;
+			// combine method values
+			$combinded = array();
+			// add comment if set
+			if (self::checkString($method->comment))
+			{
+				$combinded[] = $method->comment;
+			}
+			// set the method sginature
+			$combinded[] = "\t" . $method->visibility . ' function ' . $method->name . '(' . $method->params . ')';
+			// set the method code
+			$combinded[] = "\t" . "{";
+			// add comment if set
+			if (self::checkString($method->code))
+			{
+				$combinded[] = $method->code;
+			}
+			else
+			{
+				$combinded[] = "\t\t// add your code here";
+			}
+			$combinded[] = "\t" . "}";
+			// return the method
+			return implode(PHP_EOL, $combinded);
+		}
+		return false;
+	}
+
 	/**
 	* Making class or function name safe
 	*

admin/layouts/fieldtype/fields_fullwidth.php

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

admin/layouts/server/linked_components_fullwidth.php

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

admin/models/custom_admin_view.php

@@ -604,42 +604,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		return $data;
 	}
 
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   JForm   $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  mixed  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   12.2
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// check if the not_required field is set
-		if (ComponentbuilderHelper::checkString($data['not_required']))
-		{
-			$requiredFields = (array) explode(',',(string) $data['not_required']);
-			$requiredFields = array_unique($requiredFields);
-			// now change the required field attributes value
-			foreach ($requiredFields as $requiredField)
-			{
-				// make sure there is a string value
-				if (ComponentbuilderHelper::checkString($requiredField))
-				{
-					// change to false
-					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// also clear the data set
-					$data[$requiredField] = '';
-				}
-			}
-		}
-		return parent::validate($form, $data, $group);
-	}
-
 	/**
 	 * Method to get the unique fields of this table.
 	 *

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 getWarfields()
+	public function getVxqfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -285,13 +285,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWarfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVxqfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWarfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVxqfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWarfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVxqfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWarfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVxqfields($item->store, 'store');
 				}
 			}
 
@@ -305,7 +305,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWarfields($value,$name)
+	public function selectionTranslationVxqfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/models/forms/admin_fields_conditions.js

@@ -12,9 +12,9 @@
 
 
 function getFieldSelectOptions_server(fieldId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json");
 	if(token.length > 0 && fieldId > 0){
-		var request = 'token='+token+'&id='+fieldId;
+		var request = token+'=1&id='+fieldId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -24,7 +24,6 @@ function getFieldSelectOptions_server(fieldId){
 		jsonp: 'callback'
 	});
 }
-
 function getFieldSelectOptions(fieldKey){
 	// first check if the field is set
 	if(jQuery("#jform_addconditions__addconditions"+fieldKey+"__match_field").length) {

admin/models/forms/admin_fields_relations.js

@@ -47,13 +47,13 @@ function getCodeGlueOptions(field) {
 }
 
 function getCodeGlueOptions_server(listfield, joinfields, type, area){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getCodeGlueOptions&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getCodeGlueOptions&format=json");
 	// make sure the joinfields are set
 	if (!_isSet(joinfields)) {
 		joinfields = 'none';
 	}
 	if(token.length > 0 && listfield > 0 && type > 0 && area > 0) {
-		var request = 'token='+token+'&listfield='+listfield+'&type='+type+'&area='+area+'&joinfields='+joinfields;
+		var request = token+'=1&listfield='+listfield+'&type='+type+'&area='+area+'&joinfields='+joinfields;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -74,9 +74,9 @@ function _isSet(val)
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/admin_view.xml

@@ -1277,7 +1277,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_view Field. Type: Radio. (joomla) -->
@@ -1308,7 +1307,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Css_view Field. Type: Editor. (joomla) -->
@@ -1325,7 +1323,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_getform Field. Type: Editor. (joomla) -->
@@ -1342,7 +1339,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_views Field. Type: Radio. (joomla) -->
@@ -1373,7 +1369,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Css_views Field. Type: Editor. (joomla) -->
@@ -1390,7 +1385,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_save Field. Type: Editor. (joomla) -->
@@ -1407,7 +1401,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_javascript_view_file Field. Type: Radio. (joomla) -->
@@ -1438,7 +1431,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Javascript_view_file Field. Type: Editor. (joomla) -->
@@ -1455,7 +1447,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_allowadd Field. Type: Editor. (joomla) -->
@@ -1472,7 +1463,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
@@ -1503,7 +1493,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
@@ -1520,7 +1509,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_before_cancel Field. Type: Editor. (joomla) -->
@@ -1537,7 +1525,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_javascript_views_file Field. Type: Radio. (joomla) -->
@@ -1568,7 +1555,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Javascript_views_file Field. Type: Editor. (joomla) -->
@@ -1585,7 +1571,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
@@ -1602,7 +1587,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
@@ -1633,7 +1617,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
@@ -1650,7 +1633,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
@@ -1667,7 +1649,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_custom_button Field. Type: Radio. (joomla) -->
@@ -1698,7 +1679,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Custom_button Field. Type: Subform. (joomla) -->
@@ -2223,7 +2203,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_controller Field. Type: Editor. (joomla) -->
@@ -2240,7 +2219,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
@@ -2257,7 +2235,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_model Field. Type: Editor. (joomla) -->
@@ -2274,7 +2251,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Php_document Field. Type: Editor. (joomla) -->
@@ -2291,7 +2267,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
@@ -2308,7 +2283,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Mysql_table_charset Field. Type: List. (joomla) -->
@@ -2420,7 +2394,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Mysql_table_row_format Field. Type: List. (joomla) -->
@@ -2487,7 +2460,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Sql Field. Type: Textarea. (joomla) -->
@@ -2686,7 +2658,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_import Field. Type: Textarea. (joomla) -->
@@ -2743,7 +2714,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->

admin/models/forms/component_dashboard.js

@@ -18,9 +18,9 @@ jQuery(document).ready(function()
 });
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/custom_admin_view.js

@@ -8,19 +8,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// Some Global Values
-jform_vvvvvyjvye_required = false;
-jform_vvvvvykvyf_required = false;
-jform_vvvvvylvyg_required = false;
-jform_vvvvvymvyh_required = false;
-jform_vvvvvynvyi_required = false;
-jform_vvvvvyovyj_required = false;
-jform_vvvvvypvyk_required = false;
-jform_vvvvvyqvyl_required = false;
-jform_vvvvvyqvym_required = false;
-jform_vvvvvyrvyn_required = false;
-jform_vvvvvysvyo_required = false;
-
 // Initial Script
 jQuery(document).ready(function()
 {
@@ -62,28 +49,10 @@ function vvvvvyj(add_php_view_vvvvvyj)
 	if (add_php_view_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		// add required attribute to php_view field
-		if (jform_vvvvvyjvye_required)
-		{
-			updateFieldRequired('php_view',0);
-			jQuery('#jform_php_view').prop('required','required');
-			jQuery('#jform_php_view').attr('aria-required',true);
-			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyjvye_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		// remove required attribute from php_view field
-		if (!jform_vvvvvyjvye_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyjvye_required = true;
-		}
 	}
 }
 
@@ -94,28 +63,10 @@ function vvvvvyk(add_php_jview_display_vvvvvyk)
 	if (add_php_jview_display_vvvvvyk == 1)
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvykvyf_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvykvyf_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvykvyf_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvykvyf_required = true;
-		}
 	}
 }
 
@@ -126,28 +77,10 @@ function vvvvvyl(add_php_jview_vvvvvyl)
 	if (add_php_jview_vvvvvyl == 1)
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
-		if (jform_vvvvvylvyg_required)
-		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvylvyg_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
-		if (!jform_vvvvvylvyg_required)
-		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvylvyg_required = true;
-		}
 	}
 }
 
@@ -158,28 +91,10 @@ function vvvvvym(add_php_document_vvvvvym)
 	if (add_php_document_vvvvvym == 1)
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
-		if (jform_vvvvvymvyh_required)
-		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvymvyh_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
-		if (!jform_vvvvvymvyh_required)
-		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvymvyh_required = true;
-		}
 	}
 }
 
@@ -190,28 +105,10 @@ function vvvvvyn(add_css_document_vvvvvyn)
 	if (add_css_document_vvvvvyn == 1)
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
-		if (jform_vvvvvynvyi_required)
-		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvynvyi_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
-		if (!jform_vvvvvynvyi_required)
-		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvynvyi_required = true;
-		}
 	}
 }
 
@@ -222,28 +119,10 @@ function vvvvvyo(add_javascript_file_vvvvvyo)
 	if (add_javascript_file_vvvvvyo == 1)
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
-		if (jform_vvvvvyovyj_required)
-		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyovyj_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
-		if (!jform_vvvvvyovyj_required)
-		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyovyj_required = true;
-		}
 	}
 }
 
@@ -254,28 +133,10 @@ function vvvvvyp(add_js_document_vvvvvyp)
 	if (add_js_document_vvvvvyp == 1)
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
-		if (jform_vvvvvypvyk_required)
-		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvypvyk_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
-		if (!jform_vvvvvypvyk_required)
-		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvypvyk_required = true;
-		}
 	}
 }
 
@@ -287,49 +148,13 @@ function vvvvvyq(add_custom_button_vvvvvyq)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		// add required attribute to php_controller field
-		if (jform_vvvvvyqvyl_required)
-		{
-			updateFieldRequired('php_controller',0);
-			jQuery('#jform_php_controller').prop('required','required');
-			jQuery('#jform_php_controller').attr('aria-required',true);
-			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyqvyl_required = false;
-		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		// add required attribute to php_model field
-		if (jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('php_model',0);
-			jQuery('#jform_php_model').prop('required','required');
-			jQuery('#jform_php_model').attr('aria-required',true);
-			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyqvym_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		// remove required attribute from php_controller field
-		if (!jform_vvvvvyqvyl_required)
-		{
-			updateFieldRequired('php_controller',1);
-			jQuery('#jform_php_controller').removeAttr('required');
-			jQuery('#jform_php_controller').removeAttr('aria-required');
-			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyqvyl_required = true;
-		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		// remove required attribute from php_model field
-		if (!jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('php_model',1);
-			jQuery('#jform_php_model').removeAttr('required');
-			jQuery('#jform_php_model').removeAttr('aria-required');
-			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyqvym_required = true;
-		}
 	}
 }
 
@@ -340,28 +165,10 @@ function vvvvvyr(add_css_vvvvvyr)
 	if (add_css_vvvvvyr == 1)
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
-		if (jform_vvvvvyrvyn_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyrvyn_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
-		if (!jform_vvvvvyrvyn_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyrvyn_required = true;
-		}
 	}
 }
 
@@ -373,58 +180,13 @@ function vvvvvys(add_php_ajax_vvvvvys)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvysvyo_required)
-		{
-			updateFieldRequired('php_ajaxmethod',0);
-			jQuery('#jform_php_ajaxmethod').prop('required','required');
-			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
-			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvysvyo_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvysvyo_required)
-		{
-			updateFieldRequired('php_ajaxmethod',1);
-			jQuery('#jform_php_ajaxmethod').removeAttr('required');
-			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
-			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvysvyo_required = true;
 	}
 }
-}
-
-// update required fields
-function updateFieldRequired(name,status)
-{
-	var not_required = jQuery('#jform_not_required').val();
-
-	if(status == 1)
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required+','+name;
-		}
-		else
-		{
-			not_required = ','+name;
-		}
-	}
-	else
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required.replace(','+name,'');
-		}
-	}
-
-	jQuery('#jform_not_required').val(not_required);
-}
 
 // the isSet function
 function isSet(val)
@@ -445,9 +207,9 @@ jQuery(document).ready(function()
 });
 
 function getLinked_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = token+'=1&type='+type;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -467,9 +229,9 @@ function getLinked(){
 }
 
 function getSnippetDetails_server(snippetId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json");
 	if(token.length > 0 && snippetId > 0){
-		var request = 'token='+token+'&id='+snippetId;
+		var request = token+'=1&id='+snippetId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -516,9 +278,9 @@ function getSnippetDetails(id){
 }
 
 function getDynamicValues_server(dynamicId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
 	if(token.length > 0 && dynamicId > 0){
-		var request = 'token='+token+'&view=custom_admin_view&id='+dynamicId;
+		var request = token+'=1&view=custom_admin_view&id='+dynamicId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -543,9 +305,9 @@ function getDynamicValues(id){
 }
 
 function getLayoutDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -569,9 +331,9 @@ function getLayoutDetails(id){
 }
 
 function getTemplateDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -614,7 +376,7 @@ jQuery(document).ready(function($)
 function getSnippets_server(libraries){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
 	if(token.length > 0 && libraries.length > 0){
-		var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
+		var request = token+'=1&libraries='+JSON.stringify(libraries);
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -667,9 +429,9 @@ function setSnippets(array){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/custom_admin_view.xml

@@ -156,7 +156,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
@@ -175,7 +174,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_document Field. Type: Radio. (joomla) -->
@@ -266,7 +264,6 @@
 			syntax="html"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
@@ -304,7 +301,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
@@ -350,7 +346,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
@@ -381,7 +376,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
@@ -538,7 +532,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_document Field. Type: Editor. (joomla) -->
@@ -555,7 +548,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Css Field. Type: Editor. (joomla) -->
@@ -572,7 +564,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Libraries Field. Type: Libraries. (custom) -->
@@ -601,7 +592,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
@@ -1208,7 +1198,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
@@ -1227,7 +1216,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 	</fieldset>

admin/models/forms/custom_code.js

@@ -9,10 +9,10 @@
  */
 
 // Some Global Values
-jform_vvvvwahvzw_required = false;
+jform_vvvvwahvwz_required = false;
-jform_vvvvwaivzx_required = false;
+jform_vvvvwaivxa_required = false;
-jform_vvvvwaivzy_required = false;
+jform_vvvvwaivxb_required = false;
-jform_vvvvwaivzz_required = false;
+jform_vvvvwaivxc_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -40,13 +40,13 @@ function vvvvwah(target_vvvvwah)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwahvzw_required)
+		if (jform_vvvvwahvwz_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvwahvzw_required = false;
+			jform_vvvvwahvwz_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,13 +55,13 @@ function vvvvwah(target_vvvvwah)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwahvzw_required)
+		if (!jform_vvvvwahvwz_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvwahvzw_required = true;
+			jform_vvvvwahvwz_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
@@ -76,72 +76,72 @@ function vvvvwai(target_vvvvwai)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwaivzx_required)
+		if (jform_vvvvwaivxa_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwaivzx_required = false;
+			jform_vvvvwaivxa_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwaivzy_required)
+		if (jform_vvvvwaivxb_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwaivzy_required = false;
+			jform_vvvvwaivxb_required = false;
 		}
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwaivzz_required)
+		if (jform_vvvvwaivxc_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwaivzz_required = false;
+			jform_vvvvwaivxc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwaivzx_required)
+		if (!jform_vvvvwaivxa_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwaivzx_required = true;
+			jform_vvvvwaivxa_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwaivzy_required)
+		if (!jform_vvvvwaivxb_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwaivzy_required = true;
+			jform_vvvvwaivxb_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwaivzz_required)
+		if (!jform_vvvvwaivxc_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwaivzz_required = true;
+			jform_vvvvwaivxc_required = true;
 		}
 	}
 }
@@ -358,9 +358,9 @@ function usedin_server(functioName, ide, target){
 
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/custom_code.xml

@@ -200,7 +200,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/dynamic_get.js

@@ -9,26 +9,19 @@
  */
 
 // Some Global Values
-jform_vvvvvzgvzc_required = false;
+jform_vvvvvzgvwm_required = false;
-jform_vvvvvzivzd_required = false;
+jform_vvvvvzivwn_required = false;
-jform_vvvvvzjvze_required = false;
+jform_vvvvvzjvwo_required = false;
-jform_vvvvvzkvzf_required = false;
+jform_vvvvvzkvwp_required = false;
-jform_vvvvvzlvzg_required = false;
+jform_vvvvvzlvwq_required = false;
-jform_vvvvvzmvzh_required = false;
+jform_vvvvvzwvwr_required = false;
-jform_vvvvvzrvzi_required = false;
+jform_vvvvvzwvws_required = false;
-jform_vvvvvztvzj_required = false;
+jform_vvvvwabvwt_required = false;
-jform_vvvvvzuvzk_required = false;
+jform_vvvvwabvwu_required = false;
-jform_vvvvvzwvzl_required = false;
+jform_vvvvwabvwv_required = false;
-jform_vvvvvzwvzm_required = false;
+jform_vvvvwacvww_required = false;
-jform_vvvvvzxvzn_required = false;
+jform_vvvvwadvwx_required = false;
-jform_vvvvvzyvzo_required = false;
+jform_vvvvwaevwy_required = false;
-jform_vvvvvzzvzp_required = false;
-jform_vvvvwabvzq_required = false;
-jform_vvvvwabvzr_required = false;
-jform_vvvvwabvzs_required = false;
-jform_vvvvwacvzt_required = false;
-jform_vvvvwadvzu_required = false;
-jform_vvvvwaevzv_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -129,26 +122,26 @@ function vvvvvzg(gettype_vvvvvzg)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
 		// add required attribute to getcustom field
-		if (jform_vvvvvzgvzc_required)
+		if (jform_vvvvvzgvwm_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvzgvzc_required = false;
+			jform_vvvvvzgvwm_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
 		// remove required attribute from getcustom field
-		if (!jform_vvvvvzgvzc_required)
+		if (!jform_vvvvvzgvwm_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvzgvzc_required = true;
+			jform_vvvvvzgvwm_required = true;
 		}
 	}
 }
@@ -223,26 +216,26 @@ function vvvvvzi(main_source_vvvvvzi)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
 		// add required attribute to view_table_main field
-		if (jform_vvvvvzivzd_required)
+		if (jform_vvvvvzivwn_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvzivzd_required = false;
+			jform_vvvvvzivwn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
 		// remove required attribute from view_table_main field
-		if (!jform_vvvvvzivzd_required)
+		if (!jform_vvvvvzivwn_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvzivzd_required = true;
+			jform_vvvvvzivwn_required = true;
 		}
 	}
 }
@@ -279,26 +272,26 @@ function vvvvvzj(main_source_vvvvvzj)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
 		// add required attribute to view_selection field
-		if (jform_vvvvvzjvze_required)
+		if (jform_vvvvvzjvwo_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvvzjvze_required = false;
+			jform_vvvvvzjvwo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
 		// remove required attribute from view_selection field
-		if (!jform_vvvvvzjvze_required)
+		if (!jform_vvvvvzjvwo_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvvzjvze_required = true;
+			jform_vvvvvzjvwo_required = true;
 		}
 	}
 }
@@ -335,26 +328,26 @@ function vvvvvzk(main_source_vvvvvzk)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
 		// add required attribute to db_table_main field
-		if (jform_vvvvvzkvzf_required)
+		if (jform_vvvvvzkvwp_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvvzkvzf_required = false;
+			jform_vvvvvzkvwp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
 		// remove required attribute from db_table_main field
-		if (!jform_vvvvvzkvzf_required)
+		if (!jform_vvvvvzkvwp_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvvzkvzf_required = true;
+			jform_vvvvvzkvwp_required = true;
 		}
 	}
 }
@@ -391,26 +384,26 @@ function vvvvvzl(main_source_vvvvvzl)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
 		// add required attribute to db_selection field
-		if (jform_vvvvvzlvzg_required)
+		if (jform_vvvvvzlvwq_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvvzlvzg_required = false;
+			jform_vvvvvzlvwq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
 		// remove required attribute from db_selection field
-		if (!jform_vvvvvzlvzg_required)
+		if (!jform_vvvvvzlvwq_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvvzlvzg_required = true;
+			jform_vvvvvzlvwq_required = true;
 		}
 	}
 }
@@ -433,28 +426,10 @@ function vvvvvzm(addcalculation_vvvvvzm)
 	if (addcalculation_vvvvvzm == 1)
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').show();
-		// add required attribute to php_calculation field
-		if (jform_vvvvvzmvzh_required)
-		{
-			updateFieldRequired('php_calculation',0);
-			jQuery('#jform_php_calculation').prop('required','required');
-			jQuery('#jform_php_calculation').attr('aria-required',true);
-			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzmvzh_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').hide();
-		// remove required attribute from php_calculation field
-		if (!jform_vvvvvzmvzh_required)
-		{
-			updateFieldRequired('php_calculation',1);
-			jQuery('#jform_php_calculation').removeAttr('required');
-			jQuery('#jform_php_calculation').removeAttr('aria-required');
-			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzmvzh_required = true;
-		}
 	}
 }
 
@@ -600,28 +575,10 @@ function vvvvvzr(main_source_vvvvvzr)
 	if (main_source)
 	{
 		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
-		// add required attribute to php_custom_get field
-		if (jform_vvvvvzrvzi_required)
-		{
-			updateFieldRequired('php_custom_get',0);
-			jQuery('#jform_php_custom_get').prop('required','required');
-			jQuery('#jform_php_custom_get').attr('aria-required',true);
-			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzrvzi_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
-		// remove required attribute from php_custom_get field
-		if (!jform_vvvvvzrvzi_required)
-		{
-			updateFieldRequired('php_custom_get',1);
-			jQuery('#jform_php_custom_get').removeAttr('required');
-			jQuery('#jform_php_custom_get').removeAttr('aria-required');
-			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzrvzi_required = true;
-		}
 	}
 }
 
@@ -718,28 +675,10 @@ function vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt)
 	if (add_php_before_getitem && gettype)
 	{
 		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitem field
-		if (jform_vvvvvztvzj_required)
-		{
-			updateFieldRequired('php_before_getitem',0);
-			jQuery('#jform_php_before_getitem').prop('required','required');
-			jQuery('#jform_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvztvzj_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitem field
-		if (!jform_vvvvvztvzj_required)
-		{
-			updateFieldRequired('php_before_getitem',1);
-			jQuery('#jform_php_before_getitem').removeAttr('required');
-			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvztvzj_required = true;
-		}
 	}
 }
 
@@ -797,28 +736,10 @@ function vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu)
 	if (add_php_after_getitem && gettype)
 	{
 		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitem field
-		if (jform_vvvvvzuvzk_required)
-		{
-			updateFieldRequired('php_after_getitem',0);
-			jQuery('#jform_php_after_getitem').prop('required','required');
-			jQuery('#jform_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_php_after_getitem').addClass('required');
-			jform_vvvvvzuvzk_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitem field
-		if (!jform_vvvvvzuvzk_required)
-		{
-			updateFieldRequired('php_after_getitem',1);
-			jQuery('#jform_php_after_getitem').removeAttr('required');
-			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitem').removeClass('required');
-			jform_vvvvvzuvzk_required = true;
-		}
 	}
 }
 
@@ -865,46 +786,46 @@ function vvvvvzw(gettype_vvvvvzw)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
 		// add required attribute to add_php_after_getitem field
-		if (jform_vvvvvzwvzl_required)
+		if (jform_vvvvvzwvwr_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvzwvzl_required = false;
+			jform_vvvvvzwvwr_required = false;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
 		// add required attribute to add_php_before_getitem field
-		if (jform_vvvvvzwvzm_required)
+		if (jform_vvvvvzwvws_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvzwvzm_required = false;
+			jform_vvvvvzwvws_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
 		// remove required attribute from add_php_after_getitem field
-		if (!jform_vvvvvzwvzl_required)
+		if (!jform_vvvvvzwvwr_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvzwvzl_required = true;
+			jform_vvvvvzwvwr_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
 		// remove required attribute from add_php_before_getitem field
-		if (!jform_vvvvvzwvzm_required)
+		if (!jform_vvvvvzwvws_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvzwvzm_required = true;
+			jform_vvvvvzwvws_required = true;
 		}
 	}
 }
@@ -952,28 +873,10 @@ function vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx)
 	if (add_php_getlistquery && gettype)
 	{
 		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
-		// add required attribute to php_getlistquery field
-		if (jform_vvvvvzxvzn_required)
-		{
-			updateFieldRequired('php_getlistquery',0);
-			jQuery('#jform_php_getlistquery').prop('required','required');
-			jQuery('#jform_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_php_getlistquery').addClass('required');
-			jform_vvvvvzxvzn_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
-		// remove required attribute from php_getlistquery field
-		if (!jform_vvvvvzxvzn_required)
-		{
-			updateFieldRequired('php_getlistquery',1);
-			jQuery('#jform_php_getlistquery').removeAttr('required');
-			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_php_getlistquery').removeClass('required');
-			jform_vvvvvzxvzn_required = true;
-		}
 	}
 }
 
@@ -1031,28 +934,10 @@ function vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy)
 	if (add_php_before_getitems && gettype)
 	{
 		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitems field
-		if (jform_vvvvvzyvzo_required)
-		{
-			updateFieldRequired('php_before_getitems',0);
-			jQuery('#jform_php_before_getitems').prop('required','required');
-			jQuery('#jform_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_php_before_getitems').addClass('required');
-			jform_vvvvvzyvzo_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitems field
-		if (!jform_vvvvvzyvzo_required)
-		{
-			updateFieldRequired('php_before_getitems',1);
-			jQuery('#jform_php_before_getitems').removeAttr('required');
-			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitems').removeClass('required');
-			jform_vvvvvzyvzo_required = true;
-		}
 	}
 }
 
@@ -1110,28 +995,10 @@ function vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz)
 	if (add_php_after_getitems && gettype)
 	{
 		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitems field
-		if (jform_vvvvvzzvzp_required)
-		{
-			updateFieldRequired('php_after_getitems',0);
-			jQuery('#jform_php_after_getitems').prop('required','required');
-			jQuery('#jform_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_php_after_getitems').addClass('required');
-			jform_vvvvvzzvzp_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitems field
-		if (!jform_vvvvvzzvzp_required)
-		{
-			updateFieldRequired('php_after_getitems',1);
-			jQuery('#jform_php_after_getitems').removeAttr('required');
-			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitems').removeClass('required');
-			jform_vvvvvzzvzp_required = true;
-		}
 	}
 }
 
@@ -1178,66 +1045,66 @@ function vvvvwab(gettype_vvvvwab)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
 		// add required attribute to add_php_after_getitems field
-		if (jform_vvvvwabvzq_required)
+		if (jform_vvvvwabvwt_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvwabvzq_required = false;
+			jform_vvvvwabvwt_required = false;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
 		// add required attribute to add_php_before_getitems field
-		if (jform_vvvvwabvzr_required)
+		if (jform_vvvvwabvwu_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvwabvzr_required = false;
+			jform_vvvvwabvwu_required = false;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
 		// add required attribute to add_php_getlistquery field
-		if (jform_vvvvwabvzs_required)
+		if (jform_vvvvwabvwv_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvwabvzs_required = false;
+			jform_vvvvwabvwv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
 		// remove required attribute from add_php_after_getitems field
-		if (!jform_vvvvwabvzq_required)
+		if (!jform_vvvvwabvwt_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvwabvzq_required = true;
+			jform_vvvvwabvwt_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
 		// remove required attribute from add_php_before_getitems field
-		if (!jform_vvvvwabvzr_required)
+		if (!jform_vvvvwabvwu_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvwabvzr_required = true;
+			jform_vvvvwabvwu_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
 		// remove required attribute from add_php_getlistquery field
-		if (!jform_vvvvwabvzs_required)
+		if (!jform_vvvvwabvwv_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvwabvzs_required = true;
+			jform_vvvvwabvwv_required = true;
 		}
 	}
 }
@@ -1274,26 +1141,26 @@ function vvvvwac(gettype_vvvvwac)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
 		// add required attribute to pagination field
-		if (jform_vvvvwacvzt_required)
+		if (jform_vvvvwacvww_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvwacvzt_required = false;
+			jform_vvvvwacvww_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
 		// remove required attribute from pagination field
-		if (!jform_vvvvwacvzt_required)
+		if (!jform_vvvvwacvww_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvwacvzt_required = true;
+			jform_vvvvwacvww_required = true;
 		}
 	}
 }
@@ -1330,26 +1197,26 @@ function vvvvwad(gettype_vvvvwad)
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
 		// add required attribute to add_php_router_parse field
-		if (jform_vvvvwadvzu_required)
+		if (jform_vvvvwadvwx_required)
 		{
 			updateFieldRequired('add_php_router_parse',0);
 			jQuery('#jform_add_php_router_parse').prop('required','required');
 			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_add_php_router_parse').addClass('required');
-			jform_vvvvwadvzu_required = false;
+			jform_vvvvwadvwx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
 		// remove required attribute from add_php_router_parse field
-		if (!jform_vvvvwadvzu_required)
+		if (!jform_vvvvwadvwx_required)
 		{
 			updateFieldRequired('add_php_router_parse',1);
 			jQuery('#jform_add_php_router_parse').removeAttr('required');
 			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_add_php_router_parse').removeClass('required');
-			jform_vvvvwadvzu_required = true;
+			jform_vvvvwadvwx_required = true;
 		}
 	}
 }
@@ -1398,26 +1265,26 @@ function vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae)
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').show();
 		// add required attribute to php_router_parse field
-		if (jform_vvvvwaevzv_required)
+		if (jform_vvvvwaevwy_required)
 		{
 			updateFieldRequired('php_router_parse',0);
 			jQuery('#jform_php_router_parse').prop('required','required');
 			jQuery('#jform_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_php_router_parse').addClass('required');
-			jform_vvvvwaevzv_required = false;
+			jform_vvvvwaevwy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').hide();
 		// remove required attribute from php_router_parse field
-		if (!jform_vvvvwaevzv_required)
+		if (!jform_vvvvwaevwy_required)
 		{
 			updateFieldRequired('php_router_parse',1);
 			jQuery('#jform_php_router_parse').removeAttr('required');
 			jQuery('#jform_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_php_router_parse').removeClass('required');
-			jform_vvvvwaevzv_required = true;
+			jform_vvvvwaevwy_required = true;
 		}
 	}
 }
@@ -1560,10 +1427,10 @@ function setSelectAll(select_all){
 }
 
 function getViewTableColumns_server(viewId,asKey,rowType){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true");
 	if (token.length > 0 && viewId > 0 && asKey.length > 0)
 	{
-		var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&id='+viewId;
+		var request = token+'=1&as='+asKey+'&type='+rowType+'&id='+viewId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1598,10 +1465,10 @@ function getViewTableColumns(id, asKey, key, rowType, main, table_, nr_){
 
 function getDbTableColumns_server(name,asKey,rowType)
 {
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json&raw=true";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json&raw=true");
 	if (token.length > 0 && name.length > 0 && asKey.length > 0)
 	{
-		var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&name='+name;
+		var request = token+'=1&as='+asKey+'&type='+rowType+'&name='+name;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1696,9 +1563,9 @@ function updateSubItems(fieldName, fieldNr, table_, nr_) {
 }
 
 function getDynamicScripts_server(typpe){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && typpe.length > 0){
-		var request = 'token='+token+'&type='+typpe;
+		var request = token+'=1&type='+typpe;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1725,9 +1592,9 @@ function getDynamicScripts(id){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1764,9 +1631,9 @@ function isObject(obj) {
 }
 
 function getLinked_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = token+'=1&type='+type;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/dynamic_get.xml

@@ -281,7 +281,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Plugin_events Field. Type: List. (joomla) -->
@@ -867,7 +866,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Getcustom Field. Type: Text. (joomla) -->
@@ -900,7 +898,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Pagination Field. Type: Radio. (joomla) -->
@@ -932,7 +929,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
@@ -955,7 +951,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Filter Field. Type: Subform. (joomla) -->
@@ -1086,7 +1081,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Where Field. Type: Subform. (joomla) -->
@@ -1271,7 +1265,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Global Field. Type: Subform. (joomla) -->

admin/models/forms/field.js

@@ -9,14 +9,10 @@
  */
 
 // Some Global Values
-jform_vvvvwatwac_required = false;
+jform_vvvvwatvxf_required = false;
-jform_vvvvwauwad_required = false;
+jform_vvvvwauvxg_required = false;
-jform_vvvvwavwae_required = false;
+jform_vvvvwavvxh_required = false;
-jform_vvvvwawwaf_required = false;
+jform_vvvvwawvxi_required = false;
-jform_vvvvwazwag_required = false;
-jform_vvvvwbawah_required = false;
-jform_vvvvwbbwai_required = false;
-jform_vvvvwbcwaj_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -71,26 +67,26 @@ function vvvvwat(datalenght_vvvvwat)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwatwac_required)
+		if (jform_vvvvwatvxf_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_vvvvwatwac_required = false;
+			jform_vvvvwatvxf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwatwac_required)
+		if (!jform_vvvvwatvxf_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_vvvvwatwac_required = true;
+			jform_vvvvwatvxf_required = true;
 		}
 	}
 }
@@ -127,26 +123,26 @@ function vvvvwau(datadefault_vvvvwau)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwauwad_required)
+		if (jform_vvvvwauvxg_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_vvvvwauwad_required = false;
+			jform_vvvvwauvxg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwauwad_required)
+		if (!jform_vvvvwauvxg_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_vvvvwauwad_required = true;
+			jform_vvvvwauvxg_required = true;
 		}
 	}
 }
@@ -185,13 +181,13 @@ function vvvvwav(datatype_vvvvwav)
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwavwae_required)
+		if (jform_vvvvwavvxh_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwavwae_required = false;
+			jform_vvvvwavvxh_required = false;
 		}
 	}
 	else
@@ -200,13 +196,13 @@ function vvvvwav(datatype_vvvvwav)
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwavwae_required)
+		if (!jform_vvvvwavvxh_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwavwae_required = true;
+			jform_vvvvwavvxh_required = true;
 		}
 	}
 }
@@ -243,26 +239,26 @@ function vvvvwaw(datatype_vvvvwaw)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwawwaf_required)
+		if (jform_vvvvwawvxi_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwawwaf_required = false;
+			jform_vvvvwawvxi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwawwaf_required)
+		if (!jform_vvvvwawvxi_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwawwaf_required = true;
+			jform_vvvvwawvxi_required = true;
 		}
 	}
 }
@@ -346,28 +342,10 @@ function vvvvwaz(add_css_view_vvvvwaz)
 	if (add_css_view_vvvvwaz == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
-		// add required attribute to css_view field
-		if (jform_vvvvwazwag_required)
-		{
-			updateFieldRequired('css_view',0);
-			jQuery('#jform_css_view').prop('required','required');
-			jQuery('#jform_css_view').attr('aria-required',true);
-			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwazwag_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
-		// remove required attribute from css_view field
-		if (!jform_vvvvwazwag_required)
-		{
-			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwazwag_required = true;
-		}
 	}
 }
 
@@ -378,28 +356,10 @@ function vvvvwba(add_css_views_vvvvwba)
 	if (add_css_views_vvvvwba == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		// add required attribute to css_views field
-		if (jform_vvvvwbawah_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwbawah_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
-		// remove required attribute from css_views field
-		if (!jform_vvvvwbawah_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwbawah_required = true;
-		}
 	}
 }
 
@@ -410,28 +370,10 @@ function vvvvwbb(add_javascript_view_footer_vvvvwbb)
 	if (add_javascript_view_footer_vvvvwbb == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
-		// add required attribute to javascript_view_footer field
-		if (jform_vvvvwbbwai_required)
-		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
-			jform_vvvvwbbwai_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_view_footer field
-		if (!jform_vvvvwbbwai_required)
-		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
-			jform_vvvvwbbwai_required = true;
-		}
 	}
 }
 
@@ -442,28 +384,10 @@ function vvvvwbc(add_javascript_views_footer_vvvvwbc)
 	if (add_javascript_views_footer_vvvvwbc == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
-		// add required attribute to javascript_views_footer field
-		if (jform_vvvvwbcwaj_required)
-		{
-			updateFieldRequired('javascript_views_footer',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwbcwaj_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_views_footer field
-		if (!jform_vvvvwbcwaj_required)
-		{
-			updateFieldRequired('javascript_views_footer',1);
-			jQuery('#jform_javascript_views_footer').removeAttr('required');
-			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwbcwaj_required = true;
-		}
 	}
 }
 
@@ -527,9 +451,9 @@ jQuery(document).ready(function()
 var rowIdKey = 'properties';
 
 function getFieldOptions_server(fieldtype){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && fieldtype > 0){
-		var request = 'token='+token+'&id='+fieldtype;
+		var request = token+'=1&id='+fieldtype;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -721,9 +645,9 @@ function propertyIsSet(prop, id, targetForm) {
 }
 
 function getFieldPropertyDesc_server(fieldtype, property){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && (fieldtype > 0 || fieldtype.length > 0)&& property.length > 0){
-		var request = 'token='+token+'&fieldtype='+fieldtype+'&property='+property;
+		var request = token+'=1&fieldtype='+fieldtype+'&property='+property;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -736,9 +660,9 @@ function getFieldPropertyDesc_server(fieldtype, property){
 
 
 function getValidationRulesTable_server(){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0){
-		var request = 'token='+token+'&id=1';
+		var request = token+'=1&id=1';
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -805,9 +729,9 @@ function dbChecker(type){
 }
 
 function getLinked_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = token+'=1&type='+type;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -829,7 +753,7 @@ function getLinked(){
 function addButton_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -854,9 +778,9 @@ function addButton(type, where, size){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/field.xml

@@ -244,7 +244,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_views Field. Type: Radio. (joomla) -->
@@ -275,7 +274,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_view Field. Type: Radio. (joomla) -->
@@ -432,7 +430,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
@@ -451,7 +448,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->

admin/models/forms/fieldtype.js

@@ -9,13 +9,13 @@
  */
 
 // Some Global Values
-jform_vvvvwbdwak_required = false;
+jform_vvvvwbdvxj_required = false;
-jform_vvvvwbfwal_required = false;
+jform_vvvvwbfvxk_required = false;
-jform_vvvvwbhwam_required = false;
+jform_vvvvwbhvxl_required = false;
-jform_vvvvwbiwan_required = false;
+jform_vvvvwbivxm_required = false;
-jform_vvvvwbjwao_required = false;
+jform_vvvvwbjvxn_required = false;
-jform_vvvvwbowap_required = false;
+jform_vvvvwbovxo_required = false;
-jform_vvvvwbowaq_required = false;
+jform_vvvvwbovxp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -92,26 +92,26 @@ function vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbdwak_required)
+		if (jform_vvvvwbdvxj_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_vvvvwbdwak_required = false;
+			jform_vvvvwbdvxj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbdwak_required)
+		if (!jform_vvvvwbdvxj_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_vvvvwbdwak_required = true;
+			jform_vvvvwbdvxj_required = true;
 		}
 	}
 }
@@ -171,26 +171,26 @@ function vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbfwal_required)
+		if (jform_vvvvwbfvxk_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_vvvvwbfwal_required = false;
+			jform_vvvvwbfvxk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbfwal_required)
+		if (!jform_vvvvwbfvxk_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_vvvvwbfwal_required = true;
+			jform_vvvvwbfvxk_required = true;
 		}
 	}
 }
@@ -252,13 +252,13 @@ function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwbhwam_required)
+		if (jform_vvvvwbhvxl_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbhwam_required = false;
+			jform_vvvvwbhvxl_required = false;
 		}
 	}
 	else
@@ -267,13 +267,13 @@ function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwbhwam_required)
+		if (!jform_vvvvwbhvxl_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbhwam_required = true;
+			jform_vvvvwbhvxl_required = true;
 		}
 	}
 }
@@ -335,13 +335,13 @@ function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi)
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwbiwan_required)
+		if (jform_vvvvwbivxm_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbiwan_required = false;
+			jform_vvvvwbivxm_required = false;
 		}
 	}
 	else
@@ -350,13 +350,13 @@ function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi)
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwbiwan_required)
+		if (!jform_vvvvwbivxm_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbiwan_required = true;
+			jform_vvvvwbivxm_required = true;
 		}
 	}
 }
@@ -416,26 +416,26 @@ function vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwbjwao_required)
+		if (jform_vvvvwbjvxn_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwbjwao_required = false;
+			jform_vvvvwbjvxn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwbjwao_required)
+		if (!jform_vvvvwbjvxn_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwbjwao_required = true;
+			jform_vvvvwbjvxn_required = true;
 		}
 	}
 }
@@ -722,46 +722,46 @@ function vvvvwbo(has_defaults_vvvvwbo)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwbowap_required)
+		if (jform_vvvvwbovxo_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwbowap_required = false;
+			jform_vvvvwbovxo_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwbowaq_required)
+		if (jform_vvvvwbovxp_required)
 		{
 			updateFieldRequired('null_switch',0);
 			jQuery('#jform_null_switch').prop('required','required');
 			jQuery('#jform_null_switch').attr('aria-required',true);
 			jQuery('#jform_null_switch').addClass('required');
-			jform_vvvvwbowaq_required = false;
+			jform_vvvvwbovxp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwbowap_required)
+		if (!jform_vvvvwbovxo_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwbowap_required = true;
+			jform_vvvvwbovxo_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwbowaq_required)
+		if (!jform_vvvvwbovxp_required)
 		{
 			updateFieldRequired('null_switch',1);
 			jQuery('#jform_null_switch').removeAttr('required');
 			jQuery('#jform_null_switch').removeAttr('aria-required');
 			jQuery('#jform_null_switch').removeClass('required');
-			jform_vvvvwbowaq_required = true;
+			jform_vvvvwbovxp_required = true;
 		}
 	}
 }
@@ -810,9 +810,9 @@ jQuery(document).ready(function($)
 });
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/help_document.js

@@ -9,12 +9,11 @@
  */
 
 // Some Global Values
-jform_vvvvwbzwbc_required = false;
+jform_vvvvwbzvyb_required = false;
-jform_vvvvwcawbd_required = false;
+jform_vvvvwcavyc_required = false;
-jform_vvvvwcbwbe_required = false;
+jform_vvvvwcbvyd_required = false;
-jform_vvvvwccwbf_required = false;
+jform_vvvvwccvye_required = false;
-jform_vvvvwcdwbg_required = false;
+jform_vvvvwcevyf_required = false;
-jform_vvvvwcewbh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -46,26 +45,26 @@ function vvvvwbz(location_vvvvwbz)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwbzwbc_required)
+		if (jform_vvvvwbzvyb_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_vvvvwbzwbc_required = false;
+			jform_vvvvwbzvyb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwbzwbc_required)
+		if (!jform_vvvvwbzvyb_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_vvvvwbzwbc_required = true;
+			jform_vvvvwbzvyb_required = true;
 		}
 	}
 }
@@ -78,26 +77,26 @@ function vvvvwca(location_vvvvwca)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwcawbd_required)
+		if (jform_vvvvwcavyc_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_vvvvwcawbd_required = false;
+			jform_vvvvwcavyc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwcawbd_required)
+		if (!jform_vvvvwcavyc_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_vvvvwcawbd_required = true;
+			jform_vvvvwcavyc_required = true;
 		}
 	}
 }
@@ -123,26 +122,26 @@ function vvvvwcb(type_vvvvwcb)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwcbwbe_required)
+		if (jform_vvvvwcbvyd_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwcbwbe_required = false;
+			jform_vvvvwcbvyd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwcbwbe_required)
+		if (!jform_vvvvwcbvyd_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwcbwbe_required = true;
+			jform_vvvvwcbvyd_required = true;
 		}
 	}
 }
@@ -179,26 +178,26 @@ function vvvvwcc(type_vvvvwcc)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwccwbf_required)
+		if (jform_vvvvwccvye_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwccwbf_required = false;
+			jform_vvvvwccvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwccwbf_required)
+		if (!jform_vvvvwccvye_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwccwbf_required = true;
+			jform_vvvvwccvye_required = true;
 		}
 	}
 }
@@ -234,28 +233,10 @@ function vvvvwcd(type_vvvvwcd)
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		// add required attribute to content field
-		if (jform_vvvvwcdwbg_required)
-		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
-			jform_vvvvwcdwbg_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		// remove required attribute from content field
-		if (!jform_vvvvwcdwbg_required)
-		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
-			jform_vvvvwcdwbg_required = true;
-		}
 	}
 }
 
@@ -278,26 +259,26 @@ function vvvvwce(target_vvvvwce)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwcewbh_required)
+		if (jform_vvvvwcevyf_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwcewbh_required = false;
+			jform_vvvvwcevyf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwcewbh_required)
+		if (!jform_vvvvwcevyf_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwcewbh_required = true;
+			jform_vvvvwcevyf_required = true;
 		}
 	}
 }

admin/models/forms/help_document.xml

@@ -176,7 +176,6 @@
 			height="300 px"
 			buttons="false"
 			filter="safehtml"
-			required="true"
 		/>
 		<!-- Article Field. Type: Articles. (custom) -->
 		<field

admin/models/forms/joomla_component.js

@@ -9,28 +9,14 @@
  */
 
 // Some Global Values
-jform_vvvvvvvvvv_required = false;
+jform_vvvvvwbvvv_required = false;
-jform_vvvvvvwvvw_required = false;
+jform_vvvvvwcvvw_required = false;
-jform_vvvvvvxvvx_required = false;
+jform_vvvvvwevvx_required = false;
-jform_vvvvvvyvvy_required = false;
+jform_vvvvvwwvvy_required = false;
-jform_vvvvvvzvvz_required = false;
+jform_vvvvvwxvvz_required = false;
-jform_vvvvvwavwa_required = false;
+jform_vvvvvxavwa_required = false;
-jform_vvvvvwbvwb_required = false;
+jform_vvvvvxavwb_required = false;
-jform_vvvvvwcvwc_required = false;
+jform_vvvvvxavwc_required = false;
-jform_vvvvvwevwd_required = false;
-jform_vvvvvwfvwe_required = false;
-jform_vvvvvwgvwf_required = false;
-jform_vvvvvwhvwg_required = false;
-jform_vvvvvwlvwh_required = false;
-jform_vvvvvwmvwi_required = false;
-jform_vvvvvwnvwj_required = false;
-jform_vvvvvwovwk_required = false;
-jform_vvvvvwpvwl_required = false;
-jform_vvvvvwwvwm_required = false;
-jform_vvvvvwxvwn_required = false;
-jform_vvvvvxavwo_required = false;
-jform_vvvvvxavwp_required = false;
-jform_vvvvvxavwq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -137,28 +123,10 @@ function vvvvvvv(add_php_helper_admin_vvvvvvv)
 	if (add_php_helper_admin_vvvvvvv == 1)
 	{
 		jQuery('#jform_php_helper_admin-lbl').closest('.control-group').show();
-		// add required attribute to php_helper_admin field
-		if (jform_vvvvvvvvvv_required)
-		{
-			updateFieldRequired('php_helper_admin',0);
-			jQuery('#jform_php_helper_admin').prop('required','required');
-			jQuery('#jform_php_helper_admin').attr('aria-required',true);
-			jQuery('#jform_php_helper_admin').addClass('required');
-			jform_vvvvvvvvvv_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_helper_admin-lbl').closest('.control-group').hide();
-		// remove required attribute from php_helper_admin field
-		if (!jform_vvvvvvvvvv_required)
-		{
-			updateFieldRequired('php_helper_admin',1);
-			jQuery('#jform_php_helper_admin').removeAttr('required');
-			jQuery('#jform_php_helper_admin').removeAttr('aria-required');
-			jQuery('#jform_php_helper_admin').removeClass('required');
-			jform_vvvvvvvvvv_required = true;
-		}
 	}
 }
 
@@ -169,28 +137,10 @@ function vvvvvvw(add_php_helper_site_vvvvvvw)
 	if (add_php_helper_site_vvvvvvw == 1)
 	{
 		jQuery('#jform_php_helper_site-lbl').closest('.control-group').show();
-		// add required attribute to php_helper_site field
-		if (jform_vvvvvvwvvw_required)
-		{
-			updateFieldRequired('php_helper_site',0);
-			jQuery('#jform_php_helper_site').prop('required','required');
-			jQuery('#jform_php_helper_site').attr('aria-required',true);
-			jQuery('#jform_php_helper_site').addClass('required');
-			jform_vvvvvvwvvw_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_helper_site-lbl').closest('.control-group').hide();
-		// remove required attribute from php_helper_site field
-		if (!jform_vvvvvvwvvw_required)
-		{
-			updateFieldRequired('php_helper_site',1);
-			jQuery('#jform_php_helper_site').removeAttr('required');
-			jQuery('#jform_php_helper_site').removeAttr('aria-required');
-			jQuery('#jform_php_helper_site').removeClass('required');
-			jform_vvvvvvwvvw_required = true;
-		}
 	}
 }
 
@@ -201,28 +151,10 @@ function vvvvvvx(add_php_helper_both_vvvvvvx)
 	if (add_php_helper_both_vvvvvvx == 1)
 	{
 		jQuery('#jform_php_helper_both-lbl').closest('.control-group').show();
-		// add required attribute to php_helper_both field
-		if (jform_vvvvvvxvvx_required)
-		{
-			updateFieldRequired('php_helper_both',0);
-			jQuery('#jform_php_helper_both').prop('required','required');
-			jQuery('#jform_php_helper_both').attr('aria-required',true);
-			jQuery('#jform_php_helper_both').addClass('required');
-			jform_vvvvvvxvvx_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_helper_both-lbl').closest('.control-group').hide();
-		// remove required attribute from php_helper_both field
-		if (!jform_vvvvvvxvvx_required)
-		{
-			updateFieldRequired('php_helper_both',1);
-			jQuery('#jform_php_helper_both').removeAttr('required');
-			jQuery('#jform_php_helper_both').removeAttr('aria-required');
-			jQuery('#jform_php_helper_both').removeClass('required');
-			jform_vvvvvvxvvx_required = true;
-		}
 	}
 }
 
@@ -233,28 +165,10 @@ function vvvvvvy(add_css_admin_vvvvvvy)
 	if (add_css_admin_vvvvvvy == 1)
 	{
 		jQuery('#jform_css_admin-lbl').closest('.control-group').show();
-		// add required attribute to css_admin field
-		if (jform_vvvvvvyvvy_required)
-		{
-			updateFieldRequired('css_admin',0);
-			jQuery('#jform_css_admin').prop('required','required');
-			jQuery('#jform_css_admin').attr('aria-required',true);
-			jQuery('#jform_css_admin').addClass('required');
-			jform_vvvvvvyvvy_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_admin-lbl').closest('.control-group').hide();
-		// remove required attribute from css_admin field
-		if (!jform_vvvvvvyvvy_required)
-		{
-			updateFieldRequired('css_admin',1);
-			jQuery('#jform_css_admin').removeAttr('required');
-			jQuery('#jform_css_admin').removeAttr('aria-required');
-			jQuery('#jform_css_admin').removeClass('required');
-			jform_vvvvvvyvvy_required = true;
-		}
 	}
 }
 
@@ -265,28 +179,10 @@ function vvvvvvz(add_css_site_vvvvvvz)
 	if (add_css_site_vvvvvvz == 1)
 	{
 		jQuery('#jform_css_site-lbl').closest('.control-group').show();
-		// add required attribute to css_site field
-		if (jform_vvvvvvzvvz_required)
-		{
-			updateFieldRequired('css_site',0);
-			jQuery('#jform_css_site').prop('required','required');
-			jQuery('#jform_css_site').attr('aria-required',true);
-			jQuery('#jform_css_site').addClass('required');
-			jform_vvvvvvzvvz_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_site-lbl').closest('.control-group').hide();
-		// remove required attribute from css_site field
-		if (!jform_vvvvvvzvvz_required)
-		{
-			updateFieldRequired('css_site',1);
-			jQuery('#jform_css_site').removeAttr('required');
-			jQuery('#jform_css_site').removeAttr('aria-required');
-			jQuery('#jform_css_site').removeClass('required');
-			jform_vvvvvvzvvz_required = true;
-		}
 	}
 }
 
@@ -297,28 +193,10 @@ function vvvvvwa(add_javascript_vvvvvwa)
 	if (add_javascript_vvvvvwa == 1)
 	{
 		jQuery('#jform_javascript-lbl').closest('.control-group').show();
-		// add required attribute to javascript field
-		if (jform_vvvvvwavwa_required)
-		{
-			updateFieldRequired('javascript',0);
-			jQuery('#jform_javascript').prop('required','required');
-			jQuery('#jform_javascript').attr('aria-required',true);
-			jQuery('#jform_javascript').addClass('required');
-			jform_vvvvvwavwa_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_javascript-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript field
-		if (!jform_vvvvvwavwa_required)
-		{
-			updateFieldRequired('javascript',1);
-			jQuery('#jform_javascript').removeAttr('required');
-			jQuery('#jform_javascript').removeAttr('aria-required');
-			jQuery('#jform_javascript').removeClass('required');
-			jform_vvvvvwavwa_required = true;
-		}
 	}
 }
 
@@ -330,26 +208,26 @@ function vvvvvwb(add_sql_vvvvvwb)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvwbvwb_required)
+		if (jform_vvvvvwbvvv_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvwbvwb_required = false;
+			jform_vvvvvwbvvv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvwbvwb_required)
+		if (!jform_vvvvvwbvvv_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvwbvwb_required = true;
+			jform_vvvvvwbvvv_required = true;
 		}
 	}
 }
@@ -362,26 +240,26 @@ function vvvvvwc(add_sql_uninstall_vvvvvwc)
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').show();
 		// add required attribute to sql_uninstall field
-		if (jform_vvvvvwcvwc_required)
+		if (jform_vvvvvwcvvw_required)
 		{
 			updateFieldRequired('sql_uninstall',0);
 			jQuery('#jform_sql_uninstall').prop('required','required');
 			jQuery('#jform_sql_uninstall').attr('aria-required',true);
 			jQuery('#jform_sql_uninstall').addClass('required');
-			jform_vvvvvwcvwc_required = false;
+			jform_vvvvvwcvvw_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').hide();
 		// remove required attribute from sql_uninstall field
-		if (!jform_vvvvvwcvwc_required)
+		if (!jform_vvvvvwcvvw_required)
 		{
 			updateFieldRequired('sql_uninstall',1);
 			jQuery('#jform_sql_uninstall').removeAttr('required');
 			jQuery('#jform_sql_uninstall').removeAttr('aria-required');
 			jQuery('#jform_sql_uninstall').removeClass('required');
-			jform_vvvvvwcvwc_required = true;
+			jform_vvvvvwcvvw_required = true;
 		}
 	}
 }
@@ -408,26 +286,26 @@ function vvvvvwe(add_license_vvvvvwe)
 	{
 		jQuery('#jform_license_type').closest('.control-group').show();
 		// add required attribute to license_type field
-		if (jform_vvvvvwevwd_required)
+		if (jform_vvvvvwevvx_required)
 		{
 			updateFieldRequired('license_type',0);
 			jQuery('#jform_license_type').prop('required','required');
 			jQuery('#jform_license_type').attr('aria-required',true);
 			jQuery('#jform_license_type').addClass('required');
-			jform_vvvvvwevwd_required = false;
+			jform_vvvvvwevvx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_license_type').closest('.control-group').hide();
 		// remove required attribute from license_type field
-		if (!jform_vvvvvwevwd_required)
+		if (!jform_vvvvvwevvx_required)
 		{
 			updateFieldRequired('license_type',1);
 			jQuery('#jform_license_type').removeAttr('required');
 			jQuery('#jform_license_type').removeAttr('aria-required');
 			jQuery('#jform_license_type').removeClass('required');
-			jform_vvvvvwevwd_required = true;
+			jform_vvvvvwevvx_required = true;
 		}
 	}
 }
@@ -439,28 +317,10 @@ function vvvvvwf(add_admin_event_vvvvvwf)
 	if (add_admin_event_vvvvvwf == 1)
 	{
 		jQuery('#jform_php_admin_event-lbl').closest('.control-group').show();
-		// add required attribute to php_admin_event field
-		if (jform_vvvvvwfvwe_required)
-		{
-			updateFieldRequired('php_admin_event',0);
-			jQuery('#jform_php_admin_event').prop('required','required');
-			jQuery('#jform_php_admin_event').attr('aria-required',true);
-			jQuery('#jform_php_admin_event').addClass('required');
-			jform_vvvvvwfvwe_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_admin_event-lbl').closest('.control-group').hide();
-		// remove required attribute from php_admin_event field
-		if (!jform_vvvvvwfvwe_required)
-		{
-			updateFieldRequired('php_admin_event',1);
-			jQuery('#jform_php_admin_event').removeAttr('required');
-			jQuery('#jform_php_admin_event').removeAttr('aria-required');
-			jQuery('#jform_php_admin_event').removeClass('required');
-			jform_vvvvvwfvwe_required = true;
-		}
 	}
 }
 
@@ -471,28 +331,10 @@ function vvvvvwg(add_site_event_vvvvvwg)
 	if (add_site_event_vvvvvwg == 1)
 	{
 		jQuery('#jform_php_site_event-lbl').closest('.control-group').show();
-		// add required attribute to php_site_event field
-		if (jform_vvvvvwgvwf_required)
-		{
-			updateFieldRequired('php_site_event',0);
-			jQuery('#jform_php_site_event').prop('required','required');
-			jQuery('#jform_php_site_event').attr('aria-required',true);
-			jQuery('#jform_php_site_event').addClass('required');
-			jform_vvvvvwgvwf_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_site_event-lbl').closest('.control-group').hide();
-		// remove required attribute from php_site_event field
-		if (!jform_vvvvvwgvwf_required)
-		{
-			updateFieldRequired('php_site_event',1);
-			jQuery('#jform_php_site_event').removeAttr('required');
-			jQuery('#jform_php_site_event').removeAttr('aria-required');
-			jQuery('#jform_php_site_event').removeClass('required');
-			jform_vvvvvwgvwf_required = true;
-		}
 	}
 }
 
@@ -504,29 +346,11 @@ function vvvvvwh(addreadme_vvvvvwh)
 	{
 		jQuery('.note_readme').closest('.control-group').show();
 		jQuery('#jform_readme-lbl').closest('.control-group').show();
-		// add required attribute to readme field
-		if (jform_vvvvvwhvwg_required)
-		{
-			updateFieldRequired('readme',0);
-			jQuery('#jform_readme').prop('required','required');
-			jQuery('#jform_readme').attr('aria-required',true);
-			jQuery('#jform_readme').addClass('required');
-			jform_vvvvvwhvwg_required = false;
-		}
 	}
 	else
 	{
 		jQuery('.note_readme').closest('.control-group').hide();
 		jQuery('#jform_readme-lbl').closest('.control-group').hide();
-		// remove required attribute from readme field
-		if (!jform_vvvvvwhvwg_required)
-		{
-			updateFieldRequired('readme',1);
-			jQuery('#jform_readme').removeAttr('required');
-			jQuery('#jform_readme').removeAttr('aria-required');
-			jQuery('#jform_readme').removeClass('required');
-			jform_vvvvvwhvwg_required = true;
-		}
 	}
 }
 
@@ -585,28 +409,10 @@ function vvvvvwl(add_php_postflight_install_vvvvvwl)
 	if (add_php_postflight_install_vvvvvwl == 1)
 	{
 		jQuery('#jform_php_postflight_install-lbl').closest('.control-group').show();
-		// add required attribute to php_postflight_install field
-		if (jform_vvvvvwlvwh_required)
-		{
-			updateFieldRequired('php_postflight_install',0);
-			jQuery('#jform_php_postflight_install').prop('required','required');
-			jQuery('#jform_php_postflight_install').attr('aria-required',true);
-			jQuery('#jform_php_postflight_install').addClass('required');
-			jform_vvvvvwlvwh_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_postflight_install-lbl').closest('.control-group').hide();
-		// remove required attribute from php_postflight_install field
-		if (!jform_vvvvvwlvwh_required)
-		{
-			updateFieldRequired('php_postflight_install',1);
-			jQuery('#jform_php_postflight_install').removeAttr('required');
-			jQuery('#jform_php_postflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_install').removeClass('required');
-			jform_vvvvvwlvwh_required = true;
-		}
 	}
 }
 
@@ -617,28 +423,10 @@ function vvvvvwm(add_php_postflight_update_vvvvvwm)
 	if (add_php_postflight_update_vvvvvwm == 1)
 	{
 		jQuery('#jform_php_postflight_update-lbl').closest('.control-group').show();
-		// add required attribute to php_postflight_update field
-		if (jform_vvvvvwmvwi_required)
-		{
-			updateFieldRequired('php_postflight_update',0);
-			jQuery('#jform_php_postflight_update').prop('required','required');
-			jQuery('#jform_php_postflight_update').attr('aria-required',true);
-			jQuery('#jform_php_postflight_update').addClass('required');
-			jform_vvvvvwmvwi_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_postflight_update-lbl').closest('.control-group').hide();
-		// remove required attribute from php_postflight_update field
-		if (!jform_vvvvvwmvwi_required)
-		{
-			updateFieldRequired('php_postflight_update',1);
-			jQuery('#jform_php_postflight_update').removeAttr('required');
-			jQuery('#jform_php_postflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_update').removeClass('required');
-			jform_vvvvvwmvwi_required = true;
-		}
 	}
 }
 
@@ -649,28 +437,10 @@ function vvvvvwn(add_php_method_uninstall_vvvvvwn)
 	if (add_php_method_uninstall_vvvvvwn == 1)
 	{
 		jQuery('#jform_php_method_uninstall-lbl').closest('.control-group').show();
-		// add required attribute to php_method_uninstall field
-		if (jform_vvvvvwnvwj_required)
-		{
-			updateFieldRequired('php_method_uninstall',0);
-			jQuery('#jform_php_method_uninstall').prop('required','required');
-			jQuery('#jform_php_method_uninstall').attr('aria-required',true);
-			jQuery('#jform_php_method_uninstall').addClass('required');
-			jform_vvvvvwnvwj_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_method_uninstall-lbl').closest('.control-group').hide();
-		// remove required attribute from php_method_uninstall field
-		if (!jform_vvvvvwnvwj_required)
-		{
-			updateFieldRequired('php_method_uninstall',1);
-			jQuery('#jform_php_method_uninstall').removeAttr('required');
-			jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
-			jQuery('#jform_php_method_uninstall').removeClass('required');
-			jform_vvvvvwnvwj_required = true;
-		}
 	}
 }
 
@@ -681,28 +451,10 @@ function vvvvvwo(add_php_preflight_install_vvvvvwo)
 	if (add_php_preflight_install_vvvvvwo == 1)
 	{
 		jQuery('#jform_php_preflight_install-lbl').closest('.control-group').show();
-		// add required attribute to php_preflight_install field
-		if (jform_vvvvvwovwk_required)
-		{
-			updateFieldRequired('php_preflight_install',0);
-			jQuery('#jform_php_preflight_install').prop('required','required');
-			jQuery('#jform_php_preflight_install').attr('aria-required',true);
-			jQuery('#jform_php_preflight_install').addClass('required');
-			jform_vvvvvwovwk_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_preflight_install-lbl').closest('.control-group').hide();
-		// remove required attribute from php_preflight_install field
-		if (!jform_vvvvvwovwk_required)
-		{
-			updateFieldRequired('php_preflight_install',1);
-			jQuery('#jform_php_preflight_install').removeAttr('required');
-			jQuery('#jform_php_preflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_install').removeClass('required');
-			jform_vvvvvwovwk_required = true;
-		}
 	}
 }
 
@@ -713,28 +465,10 @@ function vvvvvwp(add_php_preflight_update_vvvvvwp)
 	if (add_php_preflight_update_vvvvvwp == 1)
 	{
 		jQuery('#jform_php_preflight_update-lbl').closest('.control-group').show();
-		// add required attribute to php_preflight_update field
-		if (jform_vvvvvwpvwl_required)
-		{
-			updateFieldRequired('php_preflight_update',0);
-			jQuery('#jform_php_preflight_update').prop('required','required');
-			jQuery('#jform_php_preflight_update').attr('aria-required',true);
-			jQuery('#jform_php_preflight_update').addClass('required');
-			jform_vvvvvwpvwl_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_preflight_update-lbl').closest('.control-group').hide();
-		// remove required attribute from php_preflight_update field
-		if (!jform_vvvvvwpvwl_required)
-		{
-			updateFieldRequired('php_preflight_update',1);
-			jQuery('#jform_php_preflight_update').removeAttr('required');
-			jQuery('#jform_php_preflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_update').removeClass('required');
-			jform_vvvvvwpvwl_required = true;
-		}
 	}
 }
 
@@ -806,26 +540,26 @@ function vvvvvww(add_update_server_vvvvvww)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
 		// add required attribute to update_server_target field
-		if (jform_vvvvvwwvwm_required)
+		if (jform_vvvvvwwvvy_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvwwvwm_required = false;
+			jform_vvvvvwwvvy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		// remove required attribute from update_server_target field
-		if (!jform_vvvvvwwvwm_required)
+		if (!jform_vvvvvwwvvy_required)
 		{
 			updateFieldRequired('update_server_target',1);
 			jQuery('#jform_update_server_target').removeAttr('required');
 			jQuery('#jform_update_server_target').removeAttr('aria-required');
 			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvwwvwm_required = true;
+			jform_vvvvvwwvvy_required = true;
 		}
 	}
 }
@@ -838,26 +572,26 @@ function vvvvvwx(buildcomp_vvvvvwx)
 	{
 		jQuery('#jform_buildcompsql').closest('.control-group').show();
 		// add required attribute to buildcompsql field
-		if (jform_vvvvvwxvwn_required)
+		if (jform_vvvvvwxvvz_required)
 		{
 			updateFieldRequired('buildcompsql',0);
 			jQuery('#jform_buildcompsql').prop('required','required');
 			jQuery('#jform_buildcompsql').attr('aria-required',true);
 			jQuery('#jform_buildcompsql').addClass('required');
-			jform_vvvvvwxvwn_required = false;
+			jform_vvvvvwxvvz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_buildcompsql').closest('.control-group').hide();
 		// remove required attribute from buildcompsql field
-		if (!jform_vvvvvwxvwn_required)
+		if (!jform_vvvvvwxvvz_required)
 		{
 			updateFieldRequired('buildcompsql',1);
 			jQuery('#jform_buildcompsql').removeAttr('required');
 			jQuery('#jform_buildcompsql').removeAttr('aria-required');
 			jQuery('#jform_buildcompsql').removeClass('required');
-			jform_vvvvvwxvwn_required = true;
+			jform_vvvvvwxvvz_required = true;
 		}
 	}
 }
@@ -915,33 +649,33 @@ function vvvvvxa(translation_tool_vvvvvxa)
 		jQuery('.note_crowdin').closest('.control-group').show();
 		jQuery('#jform_crowdin_project_api_key').closest('.control-group').show();
 		// add required attribute to crowdin_project_api_key field
-		if (jform_vvvvvxavwo_required)
+		if (jform_vvvvvxavwa_required)
 		{
 			updateFieldRequired('crowdin_project_api_key',0);
 			jQuery('#jform_crowdin_project_api_key').prop('required','required');
 			jQuery('#jform_crowdin_project_api_key').attr('aria-required',true);
 			jQuery('#jform_crowdin_project_api_key').addClass('required');
-			jform_vvvvvxavwo_required = false;
+			jform_vvvvvxavwa_required = false;
 		}
 		jQuery('#jform_crowdin_project_identifier').closest('.control-group').show();
 		// add required attribute to crowdin_project_identifier field
-		if (jform_vvvvvxavwp_required)
+		if (jform_vvvvvxavwb_required)
 		{
 			updateFieldRequired('crowdin_project_identifier',0);
 			jQuery('#jform_crowdin_project_identifier').prop('required','required');
 			jQuery('#jform_crowdin_project_identifier').attr('aria-required',true);
 			jQuery('#jform_crowdin_project_identifier').addClass('required');
-			jform_vvvvvxavwp_required = false;
+			jform_vvvvvxavwb_required = false;
 		}
 		jQuery('#jform_crowdin_username').closest('.control-group').show();
 		// add required attribute to crowdin_username field
-		if (jform_vvvvvxavwq_required)
+		if (jform_vvvvvxavwc_required)
 		{
 			updateFieldRequired('crowdin_username',0);
 			jQuery('#jform_crowdin_username').prop('required','required');
 			jQuery('#jform_crowdin_username').attr('aria-required',true);
 			jQuery('#jform_crowdin_username').addClass('required');
-			jform_vvvvvxavwq_required = false;
+			jform_vvvvvxavwc_required = false;
 		}
 	}
 	else
@@ -950,33 +684,33 @@ function vvvvvxa(translation_tool_vvvvvxa)
 		jQuery('.note_crowdin').closest('.control-group').hide();
 		jQuery('#jform_crowdin_project_api_key').closest('.control-group').hide();
 		// remove required attribute from crowdin_project_api_key field
-		if (!jform_vvvvvxavwo_required)
+		if (!jform_vvvvvxavwa_required)
 		{
 			updateFieldRequired('crowdin_project_api_key',1);
 			jQuery('#jform_crowdin_project_api_key').removeAttr('required');
 			jQuery('#jform_crowdin_project_api_key').removeAttr('aria-required');
 			jQuery('#jform_crowdin_project_api_key').removeClass('required');
-			jform_vvvvvxavwo_required = true;
+			jform_vvvvvxavwa_required = true;
 		}
 		jQuery('#jform_crowdin_project_identifier').closest('.control-group').hide();
 		// remove required attribute from crowdin_project_identifier field
-		if (!jform_vvvvvxavwp_required)
+		if (!jform_vvvvvxavwb_required)
 		{
 			updateFieldRequired('crowdin_project_identifier',1);
 			jQuery('#jform_crowdin_project_identifier').removeAttr('required');
 			jQuery('#jform_crowdin_project_identifier').removeAttr('aria-required');
 			jQuery('#jform_crowdin_project_identifier').removeClass('required');
-			jform_vvvvvxavwp_required = true;
+			jform_vvvvvxavwb_required = true;
 		}
 		jQuery('#jform_crowdin_username').closest('.control-group').hide();
 		// remove required attribute from crowdin_username field
-		if (!jform_vvvvvxavwq_required)
+		if (!jform_vvvvvxavwc_required)
 		{
 			updateFieldRequired('crowdin_username',1);
 			jQuery('#jform_crowdin_username').removeAttr('required');
 			jQuery('#jform_crowdin_username').removeAttr('aria-required');
 			jQuery('#jform_crowdin_username').removeClass('required');
-			jform_vvvvvxavwq_required = true;
+			jform_vvvvvxavwc_required = true;
 		}
 	}
 }
@@ -1108,9 +842,9 @@ function getTranslationToolDetails(){
 }
 
 function getCrowdinDetails_server(identifier, key){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getCrowdinDetails&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getCrowdinDetails&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && identifier.length > 0 && key.length > 0){
-		var request = 'token='+token+'&identifier='+identifier+'&key='+key;
+		var request = token+'=1&identifier='+identifier+'&key='+key;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1132,9 +866,9 @@ function getAjaxDisplay(type){
 }
 
 function getAjaxDisplay_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0){
-		var request = 'token='+token+'&type=' + type;
+		var request = token+'=1&type=' + type;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1165,9 +899,9 @@ function dasboardSwitch(value){
 
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1206,7 +940,7 @@ function isObject(obj) {
 function addButtonID_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0 && size > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1231,7 +965,7 @@ function addButtonID(type, where, size){
 function addButton_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/joomla_component.xml

@@ -176,7 +176,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
@@ -229,7 +228,6 @@
 			buttons="false"
 			editor="none"
 			filter="raw"
-			required="true"
 		/>
 		<!-- Php_postflight_update Field. Type: Editor. (joomla) -->
 		<field
@@ -245,7 +243,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla) -->
@@ -318,7 +315,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Css_site Field. Type: Editor. (joomla) -->
@@ -335,7 +331,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Copyright Field. Type: Textarea. (joomla) -->
@@ -366,7 +361,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Author Field. Type: Text. (joomla) -->
@@ -461,7 +455,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Website Field. Type: Url. (joomla) -->
@@ -509,7 +502,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_license Field. Type: Radio. (joomla) -->
@@ -541,7 +533,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- License_type Field. Type: List. (joomla) -->
@@ -579,7 +570,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
@@ -598,7 +588,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Whmcs_key Field. Type: Text. (joomla) -->
@@ -645,7 +634,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Whmcs_buy_link Field. Type: Url. (joomla) -->
@@ -677,7 +665,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- License Field. Type: Textarea. (joomla) -->
@@ -708,7 +695,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Bom Field. Type: Filelist. (joomla) -->

admin/models/forms/language_translation.js

@@ -23,7 +23,7 @@ function addData(result,where){
 function addButton_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/layout.js

@@ -8,9 +8,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// Some Global Values
-jform_vvvvvzfvzb_required = false;
-
 // Initial Script
 jQuery(document).ready(function()
 {
@@ -25,57 +22,12 @@ function vvvvvzf(add_php_view_vvvvvzf)
 	if (add_php_view_vvvvvzf == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		// add required attribute to php_view field
-		if (jform_vvvvvzfvzb_required)
-		{
-			updateFieldRequired('php_view',0);
-			jQuery('#jform_php_view').prop('required','required');
-			jQuery('#jform_php_view').attr('aria-required',true);
-			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzfvzb_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		// remove required attribute from php_view field
-		if (!jform_vvvvvzfvzb_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzfvzb_required = true;
 	}
 }
-}
-
-// update required fields
-function updateFieldRequired(name,status)
-{
-	var not_required = jQuery('#jform_not_required').val();
-
-	if(status == 1)
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required+','+name;
-		}
-		else
-		{
-			not_required = ','+name;
-		}
-	}
-	else
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required.replace(','+name,'');
-		}
-	}
-
-	jQuery('#jform_not_required').val(not_required);
-}
 
 // the isSet function
 function isSet(val)
@@ -94,9 +46,9 @@ jQuery(document).ready(function($)
 });
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -133,9 +85,9 @@ function isObject(obj) {
 }
 
 function getSnippetDetails_server(snippetId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json");
 	if(token.length > 0 && snippetId > 0){
-		var request = 'token='+token+'&id='+snippetId;
+		var request = token+'=1&id='+snippetId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -182,9 +134,9 @@ function getSnippetDetails(id){
 }
 
 function getDynamicValues_server(dynamicId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
 	if(token.length > 0 && dynamicId > 0){
-		var request = 'token='+token+'&view=layout&id='+dynamicId;
+		var request = token+'=1&view=layout&id='+dynamicId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -209,9 +161,9 @@ function getDynamicValues(id){
 }
 
 function getLayoutDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -254,7 +206,7 @@ jQuery(document).ready(function($)
 function getSnippets_server(libraries){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
 	if(token.length > 0 && libraries.length > 0){
-		var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
+		var request = token+'=1&libraries='+JSON.stringify(libraries);
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/layout.xml

@@ -153,7 +153,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_php_view Field. Type: Radio. (joomla) -->
@@ -192,7 +191,6 @@
 			syntax="html"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/library.js

@@ -9,8 +9,8 @@
  */
 
 // Some Global Values
-jform_vvvvwamwaa_required = false;
+jform_vvvvwamvxd_required = false;
-jform_vvvvwaswab_required = false;
+jform_vvvvwasvxe_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -99,26 +99,26 @@ function vvvvwam(how_vvvvwam)
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').show();
 		// add required attribute to php_setdocument field
-		if (jform_vvvvwamwaa_required)
+		if (jform_vvvvwamvxd_required)
 		{
 			updateFieldRequired('php_setdocument',0);
 			jQuery('#jform_php_setdocument').prop('required','required');
 			jQuery('#jform_php_setdocument').attr('aria-required',true);
 			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwamwaa_required = false;
+			jform_vvvvwamvxd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').hide();
 		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwamwaa_required)
+		if (!jform_vvvvwamvxd_required)
 		{
 			updateFieldRequired('php_setdocument',1);
 			jQuery('#jform_php_setdocument').removeAttr('required');
 			jQuery('#jform_php_setdocument').removeAttr('aria-required');
 			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwamwaa_required = true;
+			jform_vvvvwamvxd_required = true;
 		}
 	}
 }
@@ -342,26 +342,26 @@ function vvvvwas(type_vvvvwas)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwaswab_required)
+		if (jform_vvvvwasvxe_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwaswab_required = false;
+			jform_vvvvwasvxe_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwaswab_required)
+		if (!jform_vvvvwasvxe_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwaswab_required = true;
+			jform_vvvvwasvxe_required = true;
 		}
 	}
 }
@@ -430,9 +430,9 @@ function getAjaxDisplay(type){
 }
 
 function getAjaxDisplay_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod);
 	if (token.length > 0 && type.length > 0) {
-		var request = 'token='+token+'&type=' + type;
+		var request = token+'=1&type=' + type;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -444,9 +444,9 @@ function getAjaxDisplay_server(type){
 }
 
 function getFieldSelectOptions_server(fieldId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json&raw=true";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json&raw=true");
 	if (token.length > 0 && fieldId > 0) {
-		var request = 'token='+token+'&id='+fieldId;
+		var request = token+'=1&id='+fieldId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -472,9 +472,9 @@ function getFieldSelectOptions(fieldKey){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -513,7 +513,7 @@ function isObject(obj) {
 function addButtonID_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0 && size > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -538,7 +538,7 @@ function addButtonID(type, where, size){
 function addButton_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type.length > 0){
-		var request = 'token='+token+'&type='+type+'&size='+size;
+		var request = token+'=1&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -563,9 +563,9 @@ function addButton(type, where, size){
 }
 
 function getLinked_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = token+'=1&type='+type;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/placeholder.js

@@ -18,7 +18,6 @@ jQuery(document).ready(function()
 	// check if this function name is taken
 	checkPlaceholderName(placeholderName);
 });
-
 function setPlaceholderName(){
 	// noting for now (we may add more functionality later)
 }

admin/models/forms/server.js

@@ -9,15 +9,15 @@
  */
 
 // Some Global Values
-jform_vvvvwbpwas_required = false;
+jform_vvvvwbpvxr_required = false;
-jform_vvvvwbpwat_required = false;
+jform_vvvvwbpvxs_required = false;
-jform_vvvvwbpwau_required = false;
+jform_vvvvwbpvxt_required = false;
-jform_vvvvwbpwav_required = false;
+jform_vvvvwbpvxu_required = false;
-jform_vvvvwbpwaw_required = false;
+jform_vvvvwbpvxv_required = false;
-jform_vvvvwbqwax_required = false;
+jform_vvvvwbqvxw_required = false;
-jform_vvvvwbrway_required = false;
+jform_vvvvwbrvxx_required = false;
-jform_vvvvwbtwaz_required = false;
+jform_vvvvwbtvxy_required = false;
-jform_vvvvwbvwba_required = false;
+jform_vvvvwbvvxz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -66,108 +66,108 @@ function vvvvwbp(protocol_vvvvwbp)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
 		// add required attribute to authentication field
-		if (jform_vvvvwbpwas_required)
+		if (jform_vvvvwbpvxr_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwbpwas_required = false;
+			jform_vvvvwbpvxr_required = false;
 		}
 		jQuery('#jform_host').closest('.control-group').show();
 		// add required attribute to host field
-		if (jform_vvvvwbpwat_required)
+		if (jform_vvvvwbpvxs_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvwbpwat_required = false;
+			jform_vvvvwbpvxs_required = false;
 		}
 		jQuery('#jform_port').closest('.control-group').show();
 		// add required attribute to port field
-		if (jform_vvvvwbpwau_required)
+		if (jform_vvvvwbpvxt_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvwbpwau_required = false;
+			jform_vvvvwbpvxt_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwbpwav_required)
+		if (jform_vvvvwbpvxu_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwbpwav_required = false;
+			jform_vvvvwbpvxu_required = false;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').show();
 		jQuery('#jform_username').closest('.control-group').show();
 		// add required attribute to username field
-		if (jform_vvvvwbpwaw_required)
+		if (jform_vvvvwbpvxv_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvwbpwaw_required = false;
+			jform_vvvvwbpvxv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
 		// remove required attribute from authentication field
-		if (!jform_vvvvwbpwas_required)
+		if (!jform_vvvvwbpvxr_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwbpwas_required = true;
+			jform_vvvvwbpvxr_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
 		// remove required attribute from host field
-		if (!jform_vvvvwbpwat_required)
+		if (!jform_vvvvwbpvxs_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwbpwat_required = true;
+			jform_vvvvwbpvxs_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
 		// remove required attribute from port field
-		if (!jform_vvvvwbpwau_required)
+		if (!jform_vvvvwbpvxt_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwbpwau_required = true;
+			jform_vvvvwbpvxt_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwbpwav_required)
+		if (!jform_vvvvwbpvxu_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwbpwav_required = true;
+			jform_vvvvwbpvxu_required = true;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').hide();
 		jQuery('#jform_username').closest('.control-group').hide();
 		// remove required attribute from username field
-		if (!jform_vvvvwbpwaw_required)
+		if (!jform_vvvvwbpvxv_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwbpwaw_required = true;
+			jform_vvvvwbpvxv_required = true;
 		}
 	}
 }
@@ -205,13 +205,13 @@ function vvvvwbq(protocol_vvvvwbq)
 		jQuery('.note_ftp_signature').closest('.control-group').show();
 		jQuery('#jform_signature').closest('.control-group').show();
 		// add required attribute to signature field
-		if (jform_vvvvwbqwax_required)
+		if (jform_vvvvwbqvxw_required)
 		{
 			updateFieldRequired('signature',0);
 			jQuery('#jform_signature').prop('required','required');
 			jQuery('#jform_signature').attr('aria-required',true);
 			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwbqwax_required = false;
+			jform_vvvvwbqvxw_required = false;
 		}
 	}
 	else
@@ -219,13 +219,13 @@ function vvvvwbq(protocol_vvvvwbq)
 		jQuery('.note_ftp_signature').closest('.control-group').hide();
 		jQuery('#jform_signature').closest('.control-group').hide();
 		// remove required attribute from signature field
-		if (!jform_vvvvwbqwax_required)
+		if (!jform_vvvvwbqvxw_required)
 		{
 			updateFieldRequired('signature',1);
 			jQuery('#jform_signature').removeAttr('required');
 			jQuery('#jform_signature').removeAttr('aria-required');
 			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwbqwax_required = true;
+			jform_vvvvwbqvxw_required = true;
 		}
 	}
 }
@@ -274,26 +274,26 @@ function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr)
 	{
 		jQuery('#jform_password').closest('.control-group').show();
 		// add required attribute to password field
-		if (jform_vvvvwbrway_required)
+		if (jform_vvvvwbrvxx_required)
 		{
 			updateFieldRequired('password',0);
 			jQuery('#jform_password').prop('required','required');
 			jQuery('#jform_password').attr('aria-required',true);
 			jQuery('#jform_password').addClass('required');
-			jform_vvvvwbrway_required = false;
+			jform_vvvvwbrvxx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_password').closest('.control-group').hide();
 		// remove required attribute from password field
-		if (!jform_vvvvwbrway_required)
+		if (!jform_vvvvwbrvxx_required)
 		{
 			updateFieldRequired('password',1);
 			jQuery('#jform_password').removeAttr('required');
 			jQuery('#jform_password').removeAttr('aria-required');
 			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwbrway_required = true;
+			jform_vvvvwbrvxx_required = true;
 		}
 	}
 }
@@ -353,26 +353,26 @@ function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwbtwaz_required)
+		if (jform_vvvvwbtvxy_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbtwaz_required = false;
+			jform_vvvvwbtvxy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwbtwaz_required)
+		if (!jform_vvvvwbtvxy_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbtwaz_required = true;
+			jform_vvvvwbtvxy_required = true;
 		}
 	}
 }
@@ -432,26 +432,26 @@ function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwbvwba_required)
+		if (jform_vvvvwbvvxz_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_vvvvwbvwba_required = false;
+			jform_vvvvwbvvxz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwbvwba_required)
+		if (!jform_vvvvwbvvxz_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_vvvvwbvwba_required = true;
+			jform_vvvvwbvvxz_required = true;
 		}
 	}
 }

admin/models/forms/site_view.js

@@ -8,19 +8,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// Some Global Values
-jform_vvvvvytvyp_required = false;
-jform_vvvvvyuvyq_required = false;
-jform_vvvvvyvvyr_required = false;
-jform_vvvvvywvys_required = false;
-jform_vvvvvyxvyt_required = false;
-jform_vvvvvyyvyu_required = false;
-jform_vvvvvyzvyv_required = false;
-jform_vvvvvzavyw_required = false;
-jform_vvvvvzbvyx_required = false;
-jform_vvvvvzcvyy_required = false;
-jform_vvvvvzcvyz_required = false;
-
 // Initial Script
 jQuery(document).ready(function()
 {
@@ -65,28 +52,10 @@ function vvvvvyt(add_php_view_vvvvvyt)
 	if (add_php_view_vvvvvyt == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		// add required attribute to php_view field
-		if (jform_vvvvvytvyp_required)
-		{
-			updateFieldRequired('php_view',0);
-			jQuery('#jform_php_view').prop('required','required');
-			jQuery('#jform_php_view').attr('aria-required',true);
-			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvytvyp_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		// remove required attribute from php_view field
-		if (!jform_vvvvvytvyp_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvytvyp_required = true;
-		}
 	}
 }
 
@@ -97,28 +66,10 @@ function vvvvvyu(add_php_jview_display_vvvvvyu)
 	if (add_php_jview_display_vvvvvyu == 1)
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvyuvyq_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyuvyq_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvyuvyq_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvyuvyq_required = true;
-		}
 	}
 }
 
@@ -129,28 +80,10 @@ function vvvvvyv(add_php_jview_vvvvvyv)
 	if (add_php_jview_vvvvvyv == 1)
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
-		if (jform_vvvvvyvvyr_required)
-		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvyvvyr_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
-		if (!jform_vvvvvyvvyr_required)
-		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvyvvyr_required = true;
-		}
 	}
 }
 
@@ -161,28 +94,10 @@ function vvvvvyw(add_php_document_vvvvvyw)
 	if (add_php_document_vvvvvyw == 1)
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
-		if (jform_vvvvvywvys_required)
-		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvywvys_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
-		if (!jform_vvvvvywvys_required)
-		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvywvys_required = true;
-		}
 	}
 }
 
@@ -193,28 +108,10 @@ function vvvvvyx(add_css_document_vvvvvyx)
 	if (add_css_document_vvvvvyx == 1)
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
-		if (jform_vvvvvyxvyt_required)
-		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyxvyt_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
-		if (!jform_vvvvvyxvyt_required)
-		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyxvyt_required = true;
-		}
 	}
 }
 
@@ -225,28 +122,10 @@ function vvvvvyy(add_javascript_file_vvvvvyy)
 	if (add_javascript_file_vvvvvyy == 1)
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
-		if (jform_vvvvvyyvyu_required)
-		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyyvyu_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
-		if (!jform_vvvvvyyvyu_required)
-		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyyvyu_required = true;
-		}
 	}
 }
 
@@ -257,28 +136,10 @@ function vvvvvyz(add_js_document_vvvvvyz)
 	if (add_js_document_vvvvvyz == 1)
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
-		if (jform_vvvvvyzvyv_required)
-		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyzvyv_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
-		if (!jform_vvvvvyzvyv_required)
-		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyzvyv_required = true;
-		}
 	}
 }
 
@@ -289,28 +150,10 @@ function vvvvvza(add_css_vvvvvza)
 	if (add_css_vvvvvza == 1)
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
-		if (jform_vvvvvzavyw_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvzavyw_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
-		if (!jform_vvvvvzavyw_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvzavyw_required = true;
-		}
 	}
 }
 
@@ -322,29 +165,11 @@ function vvvvvzb(add_php_ajax_vvvvvzb)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvzbvyx_required)
-		{
-			updateFieldRequired('php_ajaxmethod',0);
-			jQuery('#jform_php_ajaxmethod').prop('required','required');
-			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
-			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvzbvyx_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvzbvyx_required)
-		{
-			updateFieldRequired('php_ajaxmethod',1);
-			jQuery('#jform_php_ajaxmethod').removeAttr('required');
-			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
-			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvzbvyx_required = true;
-		}
 	}
 }
 
@@ -356,49 +181,13 @@ function vvvvvzc(add_custom_button_vvvvvzc)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		// add required attribute to php_controller field
-		if (jform_vvvvvzcvyy_required)
-		{
-			updateFieldRequired('php_controller',0);
-			jQuery('#jform_php_controller').prop('required','required');
-			jQuery('#jform_php_controller').attr('aria-required',true);
-			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvzcvyy_required = false;
-		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		// add required attribute to php_model field
-		if (jform_vvvvvzcvyz_required)
-		{
-			updateFieldRequired('php_model',0);
-			jQuery('#jform_php_model').prop('required','required');
-			jQuery('#jform_php_model').attr('aria-required',true);
-			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvzcvyz_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		// remove required attribute from php_controller field
-		if (!jform_vvvvvzcvyy_required)
-		{
-			updateFieldRequired('php_controller',1);
-			jQuery('#jform_php_controller').removeAttr('required');
-			jQuery('#jform_php_controller').removeAttr('aria-required');
-			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvzcvyy_required = true;
-		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		// remove required attribute from php_model field
-		if (!jform_vvvvvzcvyz_required)
-		{
-			updateFieldRequired('php_model',1);
-			jQuery('#jform_php_model').removeAttr('required');
-			jQuery('#jform_php_model').removeAttr('aria-required');
-			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvzcvyz_required = true;
-		}
 	}
 }
 
@@ -440,33 +229,6 @@ function button_position_vvvvvzd_SomeFunc(button_position_vvvvvzd)
 	return false;
 }
 
-// update required fields
-function updateFieldRequired(name,status)
-{
-	var not_required = jQuery('#jform_not_required').val();
-
-	if(status == 1)
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required+','+name;
-		}
-		else
-		{
-			not_required = ','+name;
-		}
-	}
-	else
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required.replace(','+name,'');
-		}
-	}
-
-	jQuery('#jform_not_required').val(not_required);
-}
-
 // the isSet function
 function isSet(val)
 {
@@ -486,9 +248,9 @@ jQuery(document).ready(function()
 });
 
 function getLinked_server(type){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && type > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = token+'=1&type='+type;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -508,9 +270,9 @@ function getLinked(){
 }
 
 function getSnippetDetails_server(snippetId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json");
 	if(token.length > 0 && snippetId > 0){
-		var request = 'token='+token+'&id='+snippetId;
+		var request = token+'=1&id='+snippetId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -557,9 +319,9 @@ function getSnippetDetails(id){
 }
 
 function getDynamicValues_server(dynamicId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
 	if(token.length > 0 && dynamicId > 0){
-		var request = 'token='+token+'&view=site_view&id='+dynamicId;
+		var request = token+'=1&view=site_view&id='+dynamicId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -584,9 +346,9 @@ function getDynamicValues(id){
 }
 
 function getLayoutDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -610,9 +372,9 @@ function getLayoutDetails(id){
 }
 
 function getTemplateDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -655,7 +417,7 @@ jQuery(document).ready(function($)
 function getSnippets_server(libraries){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
 	if(token.length > 0 && libraries.length > 0){
-		var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
+		var request = token+'=1&libraries='+JSON.stringify(libraries);
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -708,9 +470,9 @@ function setSnippets(array){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/site_view.xml

@@ -156,7 +156,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Php_view Field. Type: Editor. (joomla) -->
@@ -173,7 +172,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_css_document Field. Type: Radio. (joomla) -->
@@ -262,7 +260,6 @@
 			syntax="html"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
@@ -296,7 +293,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
@@ -319,7 +315,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Custom_get Field. Type: Customgets. (custom) -->
@@ -345,7 +340,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 		<!-- Add_css Field. Type: Radio. (joomla) -->
@@ -376,7 +370,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
@@ -407,7 +400,6 @@
 			syntax="javascript"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
@@ -564,7 +556,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Libraries Field. Type: Libraries. (custom) -->
@@ -593,7 +584,6 @@
 			syntax="css"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Dynamic_get Field. Type: Dynamicgets. (custom) -->
@@ -620,7 +610,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
@@ -1246,7 +1235,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="false"
 			validate="code"
 		/>
 	</fieldset>

admin/models/forms/template.js

@@ -8,9 +8,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// Some Global Values
-jform_vvvvvzevza_required = false;
-
 // Initial Script
 jQuery(document).ready(function()
 {
@@ -25,57 +22,12 @@ function vvvvvze(add_php_view_vvvvvze)
 	if (add_php_view_vvvvvze == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		// add required attribute to php_view field
-		if (jform_vvvvvzevza_required)
-		{
-			updateFieldRequired('php_view',0);
-			jQuery('#jform_php_view').prop('required','required');
-			jQuery('#jform_php_view').attr('aria-required',true);
-			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzevza_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		// remove required attribute from php_view field
-		if (!jform_vvvvvzevza_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzevza_required = true;
 	}
 }
-}
-
-// update required fields
-function updateFieldRequired(name,status)
-{
-	var not_required = jQuery('#jform_not_required').val();
-
-	if(status == 1)
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required+','+name;
-		}
-		else
-		{
-			not_required = ','+name;
-		}
-	}
-	else
-	{
-		if (isSet(not_required) && not_required != 0)
-		{
-			not_required = not_required.replace(','+name,'');
-		}
-	}
-
-	jQuery('#jform_not_required').val(not_required);
-}
 
 // the isSet function
 function isSet(val)
@@ -94,9 +46,9 @@ jQuery(document).ready(function($)
 });
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -133,9 +85,9 @@ function isObject(obj) {
 }
 
 function getSnippetDetails_server(snippetId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json");
 	if(token.length > 0 && snippetId > 0){
-		var request = 'token='+token+'&id='+snippetId;
+		var request = token+'=1&id='+snippetId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -182,9 +134,9 @@ function getSnippetDetails(id){
 }
 
 function getDynamicValues_server(dynamicId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
 	if(token.length > 0 && dynamicId > 0){
-		var request = 'token='+token+'&view=template&id='+dynamicId;
+		var request = token+'=1&view=template&id='+dynamicId;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -209,9 +161,9 @@ function getDynamicValues(id){
 }
 
 function getLayoutDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -235,9 +187,9 @@ function getLayoutDetails(id){
 }
 
 function getTemplateDetails_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id;
+		var request = token+'=1&id='+id;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -280,7 +232,7 @@ jQuery(document).ready(function($)
 function getSnippets_server(libraries){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json";
 	if(token.length > 0 && libraries.length > 0){
-		var request = 'token='+token+'&libraries='+JSON.stringify(libraries);
+		var request = token+'=1&libraries='+JSON.stringify(libraries);
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/forms/template.xml

@@ -142,7 +142,6 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Add_php_view Field. Type: Radio. (joomla) -->
@@ -181,7 +180,6 @@
 			syntax="html"
 			editor="codemirror|none"
 			filter="raw"
-			required="true"
 			validate="code"
 		/>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->

admin/models/forms/validation_rule.js

@@ -32,9 +32,9 @@ jQuery(document).ready(function()
 });
 
 function getExistingValidationRuleCode_server(rulefilename){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getExistingValidationRuleCode&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getExistingValidationRuleCode&format=json");
 	if(token.length > 0 && rulefilename.length > 0){
-		var request = 'token='+token+'&name='+rulefilename;
+		var request = token+'=1&name='+rulefilename;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -84,9 +84,9 @@ function checkRuleName(ruleName) {
 }
 // check Function Name
 function checkRuleName_server(ruleName, ide){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkRuleName&format=json";
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.checkRuleName&format=json");
 	if(token.length > 0){
-		var request = 'token='+token+'&name='+ruleName+'&id='+ide;
+		var request = token+'=1&name='+ruleName+'&id='+ide;
 	}
 	return jQuery.ajax({
 		type: 'POST',
@@ -98,9 +98,9 @@ function checkRuleName_server(ruleName, ide){
 }
 
 function getEditCustomCodeButtons_server(id){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod;
+	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod);
 	if(token.length > 0 && id > 0){
-		var request = 'token='+token+'&id='+id+'&return_here='+return_here;
+		var request = token+'=1&id='+id+'&return_here='+return_here;
 	}
 	return jQuery.ajax({
 		type: 'GET',

admin/models/layout.php

@@ -456,42 +456,6 @@ class ComponentbuilderModelLayout extends JModelAdmin
 		return $data;
 	}
 
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   JForm   $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  mixed  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   12.2
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// check if the not_required field is set
-		if (ComponentbuilderHelper::checkString($data['not_required']))
-		{
-			$requiredFields = (array) explode(',',(string) $data['not_required']);
-			$requiredFields = array_unique($requiredFields);
-			// now change the required field attributes value
-			foreach ($requiredFields as $requiredField)
-			{
-				// make sure there is a string value
-				if (ComponentbuilderHelper::checkString($requiredField))
-				{
-					// change to false
-					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// also clear the data set
-					$data[$requiredField] = '';
-				}
-			}
-		}
-		return parent::validate($form, $data, $group);
-	}
-
 	/**
 	 * Method to get the unique fields of this table.
 	 *

admin/models/server.php

@@ -179,7 +179,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.server');
 			}
 		}
-		$this->sales_serverupdate_servervvvw = $item->id;
+		$this->sales_serverorupdate_servervvvw = $item->id;
 
 		return $item;
 	}
@@ -189,7 +189,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWbblinked_components()
+	public function getVyalinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -203,19 +203,19 @@ class ComponentbuilderModelServer extends JModelAdmin
 		// From the componentbuilder_joomla_component table
 		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
 
-		// Filter by sales_serverupdate_servervvvw global.
+		// Filter by sales_serverorupdate_servervvvw global.
-		$sales_serverupdate_servervvvw = $this->sales_serverupdate_servervvvw;
+		$sales_serverorupdate_servervvvw = $this->sales_serverorupdate_servervvvw;
-		if (is_numeric($sales_serverupdate_servervvvw ))
+		if (is_numeric($sales_serverorupdate_servervvvw ))
 		{
-			$query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvw . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvw, ' OR');
+			$query->where('a.sales_serverORupdate_server = ' . (int) $sales_serverorupdate_servervvvw );
 		}
-		elseif (is_string($sales_serverupdate_servervvvw))
+		elseif (is_string($sales_serverorupdate_servervvvw))
 		{
-			$query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvw) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvw), ' OR');
+			$query->where('a.sales_serverORupdate_server = ' . $db->quote($sales_serverorupdate_servervvvw));
 		}
 		else
 		{
-			$query->where('a.update_server = -5');
+			$query->where('a.sales_serverORupdate_server = -5');
 		}
 
 		// Join over the asset groups.

admin/models/site_view.php

@@ -625,42 +625,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		return $data;
 	}
 
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   JForm   $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  mixed  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   12.2
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// check if the not_required field is set
-		if (ComponentbuilderHelper::checkString($data['not_required']))
-		{
-			$requiredFields = (array) explode(',',(string) $data['not_required']);
-			$requiredFields = array_unique($requiredFields);
-			// now change the required field attributes value
-			foreach ($requiredFields as $requiredField)
-			{
-				// make sure there is a string value
-				if (ComponentbuilderHelper::checkString($requiredField))
-				{
-					// change to false
-					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// also clear the data set
-					$data[$requiredField] = '';
-				}
-			}
-		}
-		return parent::validate($form, $data, $group);
-	}
-
 	/**
 	 * Method to get the unique fields of this table.
 	 *

admin/models/template.php

@@ -456,42 +456,6 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 		return $data;
 	}
 
-	/**
-	 * Method to validate the form data.
-	 *
-	 * @param   JForm   $form   The form to validate against.
-	 * @param   array   $data   The data to validate.
-	 * @param   string  $group  The name of the field group to validate.
-	 *
-	 * @return  mixed  Array of filtered data if valid, false otherwise.
-	 *
-	 * @see     JFormRule
-	 * @see     JFilterInput
-	 * @since   12.2
-	 */
-	public function validate($form, $data, $group = null)
-	{
-		// check if the not_required field is set
-		if (ComponentbuilderHelper::checkString($data['not_required']))
-		{
-			$requiredFields = (array) explode(',',(string) $data['not_required']);
-			$requiredFields = array_unique($requiredFields);
-			// now change the required field attributes value
-			foreach ($requiredFields as $requiredField)
-			{
-				// make sure there is a string value
-				if (ComponentbuilderHelper::checkString($requiredField))
-				{
-					// change to false
-					$form->setFieldAttribute($requiredField, 'required', 'false');
-					// also clear the data set
-					$data[$requiredField] = '';
-				}
-			}
-		}
-		return parent::validate($form, $data, $group);
-	}
-
 	/**
 	 * Method to get the unique fields of this table.
 	 *

admin/views/admin_fields_conditions/tmpl/edit.php

@@ -131,4 +131,21 @@ jQuery(document).ready(function(){
 		}
 	});
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

admin/views/admin_fields_relations/tmpl/edit.php

@@ -104,3 +104,26 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 </div>
 </form>
 </div>
+
+<script type="text/javascript">
+
+
+
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
+</script>

admin/views/compiler/tmpl/default.php

@@ -67,12 +67,13 @@ Joomla.submitbutton = function(task)
 }
 // Add spindle-wheel for importations:
 jQuery(document).ready(function($) {
-	var outerDiv = $('body');
 
-	$('<div id="loading"></div>')
+// waiting spinner
+var outerDiv = jQuery('body');
+jQuery('<div id="loading"></div>')
 	.css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat")
-		.css("top", outerDiv.position().top - $(window).scrollTop())
+	.css("top", outerDiv.position().top - jQuery(window).scrollTop())
-		.css("left", outerDiv.position().left - $(window).scrollLeft())
+	.css("left", outerDiv.position().left - jQuery(window).scrollLeft())
 	.css("width", outerDiv.width())
 	.css("height", outerDiv.height())
 	.css("position", "fixed")

admin/views/compiler/view.html.php

@@ -233,7 +233,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 			function getComponentDetails_server(id){
 				var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.getComponentDetails&format=json\");
 				if(token.length > 0 && id > 0){
-					var request = 'token='+token+'&id='+id;
+					var request = token+'=1&id='+id;
 				}
 				return jQuery.ajax({
 					type: 'GET',
@@ -278,7 +278,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 					var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.isRead&format=json\");
 				}	
 				if(token.length > 0 && notice.length){
-					var request = \"token=\"+token+\"&notice=\"+notice;
+					var request = token+\"=1&notice=\"+notice;
 				}
 				return jQuery.ajax({
 					type: \"POST\",

admin/views/component_dashboard/tmpl/edit.php

@@ -104,3 +104,26 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 </div>
 </form>
 </div>
+
+<script type="text/javascript">
+
+
+
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
+</script>

admin/views/custom_admin_view/tmpl/edit.php

@@ -397,6 +397,23 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 jQuery(document).ready(function(){
 	jQuery(document).on('subform-row-add', function(event, row){
 		getIconImage(jQuery(row).find('.icomoon342'));

admin/views/custom_code/tmpl/edit.php

@@ -267,4 +267,21 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

admin/views/dynamic_get/tmpl/edit.php

@@ -663,20 +663,17 @@ jQuery(document).ready(function(){
 	});
 
 });
-
 <?php foreach($fieldNames as $fieldName => $funcName): ?>jQuery('#adminForm').on('change', '#jform_<?php echo $fieldName ?>_table_main',function (e) {
 	// get options
 	var value_<?php echo $fieldName ?> = jQuery("#jform_<?php echo $fieldName ?>_table_main option:selected").val();
 	get<?php echo $funcName; ?>TableColumns(value_<?php echo $fieldName ?>, 'a', '<?php echo $fieldName ?>', 3, true, '', '');
 });
 <?php endforeach; ?>
-
 // #jform_add_php_router_parse listeners
 jQuery('#jform_add_php_router_parse').on('change',function() {
 	var valueSwitch = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
 	getDynamicScripts(valueSwitch);
 });
-
 jQuery('#adminForm').on('change', '#jform_select_all',function (e)
 {
 	e.preventDefault();
@@ -686,6 +683,22 @@ jQuery('#adminForm').on('change', '#jform_select_all',function (e)
 
 });
 
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 
 // nice little dot trick :)
 jQuery(document).ready( function($) {

admin/views/fieldtype/tmpl/edit.php

@@ -492,4 +492,23 @@ jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 
 });
 
+
+
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

admin/views/fieldtype/view.html.php

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

admin/views/get_snippets/tmpl/default.php

@@ -227,6 +227,23 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>
 <?php else: ?>
         <h1><?php echo JText::_('COM_COMPONENTBUILDER_NO_ACCESS_GRANTED'); ?></h1>

admin/views/languages/tmpl/default.php

@@ -85,6 +85,7 @@ if ($this->saveOrder)
 </form>
 <script type="text/javascript">
 // languages footer script
+
 // waiting spinner
 var outerDiv = jQuery('body');
 jQuery('<div id="loading"></div>')
@@ -99,7 +100,6 @@ jQuery('<div id="loading"></div>')
 	.css("filter", "alpha(opacity = 80)")
 	.css("display", "none")
 	.appendTo(outerDiv);
-
 // when the build button is clicked
 jQuery('#toolbar').on('click',"button.button-joomla", function(e){
 	jQuery('#loading').show();

admin/views/layout/tmpl/edit.php

@@ -160,6 +160,36 @@ jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	e.preventDefault();
 	getSnippets();
 });
+jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
+	e.preventDefault();
+	// get type value
+	var snippetId = jQuery("#jform_snippet option:selected").val();
+	getSnippetDetails(snippetId);
+});
+
+jQuery(document).ready(function() {
+	// get type value
+	var snippetId = jQuery("#jform_snippet option:selected").val();
+	getSnippetDetails(snippetId);
+});
+jQuery('#adminForm').on('change', '#jform_dynamic_get',function (e) {
+	e.preventDefault();
+	// get type value
+	var dynamicId = jQuery("#jform_dynamic_get option:selected").val();
+	getDynamicValues(dynamicId);
+});
+jQuery(document).ready(function() {
+	// get type value
+	var dynamicId = jQuery("#jform_dynamic_get option:selected").val();
+	getDynamicValues(dynamicId);
+});
+jQuery(document).ready(function() {
+	// get type value
+	getLayoutDetails(<?php echo ($this->item->id) ? $this->item->id:9999; ?>);
+});
+// some lang strings
+var select_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
+var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
 
 jQuery.fn.selText = function() {
     var obj = this[0];
@@ -180,37 +210,20 @@ jQuery.fn.selText = function() {
     return this;
 }
 
-jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
+<?php
-	e.preventDefault();
+	$app = JFactory::getApplication();
-	// get type value
+?>
-	var snippetId = jQuery("#jform_snippet option:selected").val();
+function JRouter(link) {
-	getSnippetDetails(snippetId);
+<?php
-});
+	if ($app->isSite())
-
+	{
-jQuery(document).ready(function() {
+		echo 'var url = "'.JURI::root().'";';
-	// get type value
+	}
-	var snippetId = jQuery("#jform_snippet option:selected").val();
+	else
-	getSnippetDetails(snippetId);
+	{
-});
+		echo 'var url = "";';
-
+	}
-jQuery('#adminForm').on('change', '#jform_dynamic_get',function (e) {
+?>
-	e.preventDefault();
+	return url+link;
-	// get type value
+}
-	var dynamicId = jQuery("#jform_dynamic_get option:selected").val();
-	getDynamicValues(dynamicId);
-});
-
-jQuery(document).ready(function() {
-	// get type value
-	var dynamicId = jQuery("#jform_dynamic_get option:selected").val();
-	getDynamicValues(dynamicId);
-});
-
-jQuery(document).ready(function() {
-	// get type value
-	getLayoutDetails(<?php echo ($this->item->id) ? $this->item->id:9999; ?>);
-});
-// some lang strings
-var select_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
-var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
 </script>

admin/views/placeholder/tmpl/edit.php

@@ -135,4 +135,21 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

admin/views/server/view.html.php

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

admin/views/site_view/tmpl/edit.php

@@ -415,6 +415,23 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 }); 
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 jQuery(document).ready(function(){
 	jQuery(document).on('subform-row-add', function(event, row){
 		getIconImage(jQuery(row).find('.icomoon342'));

admin/views/template/tmpl/edit.php

@@ -214,4 +214,21 @@ jQuery(document).ready(function() {
 // some lang strings
 var select_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

admin/views/validation_rule/tmpl/edit.php

@@ -121,7 +121,6 @@ jQuery('#componentbuilder_loader').on('change', '#jform_inherit',function (e) {
 	var rulefilename = jQuery("#jform_inherit option:selected").val();
 	getExistingValidationRuleCode(rulefilename);
 });
-
 jQuery('#componentbuilder_loader').on('change', '#jform_name',function (e)
 {
 	var ruleName = jQuery('#jform_name').val();
@@ -129,7 +128,6 @@ jQuery('#componentbuilder_loader').on('change', '#jform_name',function (e)
 	checkRuleName(ruleName);
 });
 
-
 // nice little dot trick :)
 jQuery(document).ready( function($) {
   var x=0;
@@ -142,4 +140,21 @@ jQuery(document).ready( function($) {
 	$(".loading-dots").text(dots);
   } , 500);
 });
+
+<?php
+	$app = JFactory::getApplication();
+?>
+function JRouter(link) {
+<?php
+	if ($app->isSite())
+	{
+		echo 'var url = "'.JURI::root().'";';
+	}
+	else
+	{
+		echo 'var url = "";';
+	}
+?>
+	return url+link;
+}
 </script>

componentbuilder.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>6th July, 2019</creationDate>
+	<creationDate>8th July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>

site/helpers/componentbuilder.php

@@ -124,6 +124,65 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* get the method code
+	*
+	* @input	int       The method ID
+	*
+	* @returns string on success
+	**/
+	public static function getMethodCode($id)
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.comment','a.name','a.visibility','a.params','a.code')));
+		$query->from($db->quoteName('#__componentbuilder_method','a'));
+		$query->where($db->quoteName('a.id') . ' = ' . (int) $id);
+		// Implement View Level Access
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_method');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{
+			// get the method
+			$method = $db->loadObject;
+			// combine method values
+			$combinded = array();
+			// add comment if set
+			if (self::checkString($method->comment))
+			{
+				$combinded[] = $method->comment;
+			}
+			// set the method sginature
+			$combinded[] = "\t" . $method->visibility . ' function ' . $method->name . '(' . $method->params . ')';
+			// set the method code
+			$combinded[] = "\t" . "{";
+			// add comment if set
+			if (self::checkString($method->code))
+			{
+				$combinded[] = $method->code;
+			}
+			else
+			{
+				$combinded[] = "\t\t// add your code here";
+			}
+			$combinded[] = "\t" . "}";
+			// return the method
+			return implode(PHP_EOL, $combinded);
+		}
+		return false;
+	}
+
 	/**
 	* Making class or function name safe
 	*