Major code formate to try and set a standared. Added four new fields for JavaScript files

README.md

@@ -10,7 +10,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -112,11 +112,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 14th December, 2017
-+ *Version*: 2.6.6
++ *Version*: 2.6.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **177938**
++ *Line count*: **178213**
-+ *File count*: **1142**
++ *File count*: **1145**
 + *Folder count*: **184**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -10,7 +10,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -112,11 +112,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 14th December, 2017
-+ *Version*: 2.6.6
++ *Version*: 2.6.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **177938**
++ *Line count*: **178213**
-+ *File count*: **1142**
++ *File count*: **1145**
 + *Folder count*: **184**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/js/get_snippets.js

@@ -0,0 +1,542 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		get_snippets.js
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* JS Document */
+// start the moment the document is ready
+jQuery(document).ready(function () {
+	// just get the available libraries
+	getLibraries(snippetsPath);
+});
+
+// add an ajax call tracker
+var ajaxcall = null;
+var fromLocal = false;
+
+jQuery(document).ready(function(){
+	jQuery('body').on('click','.getreaction',function(){
+		// Ajax request
+		var btn = jQuery(this);
+		btn.prop('disabled', true);
+		setTimeout(function(){
+			btn.prop('disabled', false);
+		}, 3000);
+		var type = btn.data('type');
+		if ('getLibraries' === type) {
+			getLibraries(snippetsPath);
+		} else if ('getSnippets' === type) {
+			var name = btn.data('name');
+			getSnippets(snippetsPath, name);
+		} else if ('all' === type) {
+			var status = btn.data('status');
+			bulkSnippetGithub(status);
+		} else if ('bulk' === type) {
+			checkBulkSnippetGithub();
+		} else if ('get' === type) {
+			var path = btn.data('path');
+			var status = btn.data('status');
+			setSnippetGithub(path, status);
+		} else {
+			var path = btn.data('path');
+			getSnippetModal(path, type);
+		}
+	});
+});
+
+// load every thing once ready
+jQuery(document).ajaxStop(function () {
+	if (0 === jQuery.active) {
+		//do something special
+		if ('snippets' === ajaxcall) {
+			setTimeout( function() {
+				jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
+				jQuery('#snippets-display').show();
+				jQuery('#snippets-grid').trigger('display.uk.check');
+				jQuery('#loading').hide();
+			}, 1000);
+		} 
+	}
+});
+
+// get the libraries
+function getLibraries(path) {
+	var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
+	// always hide the snippets display
+	jQuery('#snippets-display').hide();
+	// always reset the grid
+	jQuery('#libraries-grid').html('');
+	// set the ajax scope
+	ajaxcall = 'libraries';
+	if (_paths) {
+		buildLibraries(_paths);
+	} else {
+		jQuery.get(path)
+		.success(function(paths) {
+			// load only this library paths
+			jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
+			buildLibraries(paths);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			jQuery('#snippets-github').html(returnError);
+		});
+	}
+}
+
+// build the ibraries object
+function buildLibraries(paths) {
+	var _temp = jQuery.jStorage.get('JCB-Libraries', null);
+	if (_temp) {
+		setLibraries(_temp);
+	} else {
+		var temp = {};
+		jQuery.each(paths.tree, function(key,value) {
+			if (value.path.match(".json$")) {
+				var libName = value.path.split(/ -(.+)/)[0];
+				libName = libName.trim()
+				temp[libName] = libName;
+			}
+		});
+		// load only this library paths
+		jQuery.jStorage.set('JCB-Libraries', temp, {TTL: expire});
+		setLibraries(temp);
+	}
+}
+
+// set the libraries
+function setLibraries(names) {
+	// now load the lib buttons
+	jQuery.each(names, function(value) {
+		setLibrary(value);
+	});
+	setTimeout( function() {
+		jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES')+'</h1>');
+		jQuery('#libraries-display').show();
+		jQuery('#libraries-grid').trigger('display.uk.check');
+	}, 1000);
+}
+
+// set the snippets
+function setLibrary(name) {
+	// get useful ID
+	var keyID = getKeyID(name);
+	// build the library display
+	var html = '<div id="'+keyID+'-panel" class="uk-panel">';
+	html += '<div class="uk-panel uk-panel-box uk-width-1-1">';
+	html += '<h3 class="uk-panel-title">' + name + '</h3>';
+	html += '<hr />';
+	// set the data buttons
+	html += setLibButtons(name);
+	// close the box panel
+	html += '</div>';
+	html += '</div>';
+	// now we have the library
+	jQuery('#libraries-grid').append(html);
+}
+
+function setLibButtons(name) {
+	return  '<button class="uk-button uk-button-small uk-button-success uk-width-1-1 getreaction" data-name="'+name+'" data-type="getSnippets" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-thumb-tack"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS')+'</span></button>';
+}
+
+// get the snippets
+function getSnippets(path, libraryName) {
+	jQuery('#loading').show();
+	// get local values if set
+	var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
+	// always reset the grid
+	jQuery('#snippets-grid').html('');
+	// always hide libraries
+	jQuery('#libraries-display').hide();
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	fromLocal = false;
+	if (_paths) {
+		setSnippets(_paths, libraryName);
+		jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
+	} else {
+		jQuery.get(path)
+		.success(function(paths) {
+			// load only this library paths
+			jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
+			setSnippets(paths, libraryName);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			jQuery('#snippets-github').html(returnError);
+		});
+	}
+	// only use if loading localy
+	if (fromLocal) {
+		jQuery('#snippets-display').show();
+		jQuery('#snippets-grid').trigger('display.uk.check');
+		jQuery('#loading').hide();
+	}
+}
+
+// set the snippets
+function setSnippets(paths, libraryName) {
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	jQuery.each(paths.tree, function(key,value) {
+		if (value.path.match(".json$") && value.path.match("^"+libraryName)) {
+			var _snippet = jQuery.jStorage.get(value.path, null);
+			if (_snippet) {
+				setSnippet(_snippet, value.path);
+				fromLocal = true;
+			} else {
+				jQuery.get(snippetPath+value.path)
+				.success(function(snippet) {
+					// convert the string to json.object
+					snippet = jQuery.parseJSON(snippet);
+					jQuery.jStorage.set(value.path, snippet, {TTL: expire});
+					setSnippet(snippet, value.path);
+				})
+				.error(function(jqXHR, textStatus, errorThrown) { 
+					// we could do more
+				});
+			}
+		}
+	});
+}
+
+// set the snippets
+function setSnippet(snippet, key) {
+	// get useful ID
+	var keyID = getKeyID(key);
+	// get the status
+	var status = getSnippetStatus(snippet, key);
+	// add to bulk updater
+	if ('equal' !== status) {
+		bulkItems[status].push(key);
+	}
+	// build the snippet display
+	var html = '<div id="'+keyID+'-panel" class="uk-panel" data-uk-filter="'+status+'" data-snippet-libraries="'+snippet.library+'" data-snippet-types="'+snippet.type+'" data-snippet-name="'+snippet.name+'">';
+	html += '<div class="uk-panel uk-panel-box uk-width-1-1">';
+	html += '<div class="uk-panel-badge uk-badge" ><a id="'+keyID+'-badge" href="#'+status+'-meaning" data-uk-offcanvas class="uk-text-uppercase uk-text-contrast"><i class="uk-icon-info"></i> '+status+'</a></div><br />';
+	html += '<h3 class="uk-panel-title">' + snippet.library+ ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
+	html += snippet.heading + '<hr />';
+	// set the data buttons
+	html += setDataButtons(snippet, key, status);
+	// set the snippet ref button
+	html += setRefButtons(snippet, key, status, keyID);
+	// set the contributor buttons
+	html += setContributorButtons(snippet, key);
+	// close the box panel
+	html += '</div>';
+	html += '</div>';
+	// now we have the snippet
+	jQuery('#snippets-grid').append(html);
+}
+
+// set the snippet status
+function getSnippetStatus(snippet, key) {
+	// check if JCB already has this snippet
+	if(local_snippets.hasOwnProperty(key)){
+		// first get local time stamp
+		var local_created = strtotime(local_snippets[key].created);
+		var local_modified = strtotime(local_snippets[key].modified);
+		// now get github time stamps					
+		var created = strtotime(snippet.created);
+		var modified = strtotime(snippet.modified);
+		// work out the status
+		if (local_created == created) {
+			if (local_modified == modified) {
+				return 'equal';
+			} else if (local_modified > modified) {
+				return 'ahead';
+			} else if (local_modified < modified) {
+				return 'behind';
+			}
+		}
+		return 'diverged';
+	}
+	return 'new';
+}
+
+function setDataButtons(snippet, key, status) {
+	var html = '<div class="uk-button-group uk-width-1-1 uk-margin-small-bottom">';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="usage" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_USAGE_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-info"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_USAGE')+'</span></button>';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="description" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-sticky-note-o"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_DESCRIPTION')+'</span></button>';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="snippet" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-code"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET')+'</span></button>';
+	html += '</div>';
+	// return data buttons
+	return html;
+}
+
+function setRefButtons(snippet, key, status, keyID) {
+	var html = '<div><a class="uk-button uk-button-mini uk-button-success uk-margin-small-bottom uk-width-1-1" href="'+snippet.url+'" target="_blank" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_REFERENCE_URL')+'"><i class="uk-icon-external-link"></i> ' + snippet.name + '</a></div>';
+	// set the update button	
+	html += '<div>';
+	if ('equal' !== status) {
+		if ('new' === status) {
+			var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY');
+		} else {
+			var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION');
+		}
+		html += '<button id="'+keyID+'-getbutton" class="uk-button uk-button-small uk-button-primary uk-width-1-1 uk-margin-small-bottom getreaction" data-status="'+status+'" data-path="'+key+'" data-type="get"  title="'+tooltip+'"><i class="uk-icon-cloud-download"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_GET_SNIPPET')+'</button>';
+	} else {
+		html += '<button class="uk-button uk-button-small uk-width-1-1 uk-margin-small-bottom" type="button" disabled title="'+Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION')+'"><i class="uk-icon-check-square-o"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET')+'</button>';
+	}
+	html += '</div>';
+	// return data buttons
+	return html;
+}
+
+function setContributorButtons(snippet, key) {
+	// set the contributor name
+	if (snippet.contributor_company) {
+		var contributor_name = snippet.contributor_company;
+	} else if (snippet.contributor_name) {
+		var contributor_name = snippet.contributor_name;
+	} else {
+		var contributor_name = Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY');
+	}
+	// set the contributor url
+	if (snippet.contributor_website) {
+		var contributor_url = snippet.contributor_website;
+	} else if (snippet.contributor_email) {
+		var contributor_url = 'mailto:'+snippet.contributor_email;
+	} else {
+		var contributor_url = 'https://github.com/vdm-io/Joomla-Component-Builder-Snippets';
+	}
+	var html = '<div class="uk-button-group uk-width-1-1">';
+	html += '<button class="uk-button uk-button-primary uk-width-1-10 uk-button-mini getreaction" data-type="contributor" data-path="'+key+'" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_THE_CONTRIBUTOR_DETAILS')+'"><i class="uk-icon-user"></i></button>';
+	html += '<a  class="uk-button uk-button-primary uk-width-5-10 uk-button-mini" href="'+contributor_url+'" target="_blank"  title="'+Joomla.JText._('COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR')+'"><i class="uk-icon-external-link"></i> ' + contributor_name + '</a>';
+	html += '<a class="uk-button uk-button-primary uk-width-4-10 uk-button-mini" href="https://github.com/vdm-io/Joomla-Component-Builder-Snippets/blame/master/'+key+'" target="_blank" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_WHO_CONTRIBUTED_TO_THIS_SNIPPET')+'"><i class="uk-icon-external-link"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_BLAME')+'</a>';
+	html += '</div>';
+	// return contributor buttons
+	return html;
+}
+
+// do a bulk update
+function checkBulkSnippetGithub() {
+	// check if there is new items
+	if (bulkItems.new.length === 0) {
+		jQuery('#bulk-button-new').prop('disabled', true);
+		jQuery('#bulk-button-new').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-new').show();
+	}
+	// check if there is diverged items
+	if (bulkItems.diverged.length === 0) {
+		jQuery('#bulk-button-diverged').prop('disabled', true);
+		jQuery('#bulk-button-diverged').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-diverged').show();
+	}
+	// check if there is ahead items
+	if (bulkItems.ahead.length === 0) {
+		jQuery('#bulk-button-ahead').prop('disabled', true);
+		jQuery('#bulk-button-ahead').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-ahead').show();
+	}
+	// check if there is behind items
+	if (bulkItems.behind.length === 0) {
+		jQuery('#bulk-button-behind').prop('disabled', true);
+		jQuery('#bulk-button-behind').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-behind').show();
+	}
+	// check if all we should close the all button
+	if (bulkItems.behind.length === 0 && bulkItems.new.length === 0 && bulkItems.ahead.length === 0 && bulkItems.diverged.length === 0) {
+		jQuery('#bulk-button-all').prop('disabled', true);
+		jQuery('#bulk-button-all').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME'));
+		jQuery('#bulk-notice-all').show();
+	}
+}
+
+// do a bulk update
+function bulkSnippetGithub(status) {
+	// if all then trigger those with values
+	if ('all' === status) {
+		bulkSnippetGithub('behind');
+		bulkSnippetGithub('new');
+		bulkSnippetGithub('ahead');
+		bulkSnippetGithub('diverged');
+	} else if (bulkItems[status].length > 0) {
+		jQuery.each(bulkItems[status], function(i, key){
+			setTimeout(function(){
+				doBulkUpdate_server(key, status).done(function(result) {
+					if (result.message) {
+						// only show errors
+						if ('error' === result.status || 'warning' === result.status) {
+							UIkit.notify(result.message, {status: result.status});
+						}
+						// update local items
+						if ('success' === result.status) {
+							// get key ID
+							var keyID = getKeyID(key);
+							// update snippet if we can
+							updateSnippetDisplay(keyID, 'equal');
+						}
+					} else {
+						UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
+					}
+				});
+			}, 200);
+		});
+		// reset array
+		bulkItems[status].length = 0;
+		// update the buttons (since we only do the bulk update once)
+		checkBulkSnippetGithub();
+	}
+}
+
+function doBulkUpdate_server(path, status) {
+	// set the ajax scope
+	ajaxcall = null;
+	var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json";
+	if (token.length > 0 && path.length > 0 && status.length > 0) {
+		var request = 'token='+token+'&path='+path+'&status='+status;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+// set the snippet from gitHub
+function setSnippetGithub(key, status) {
+	var message = getConfirmUpdate(status);
+	UIkit.modal.confirm(message, function(){
+		// will be executed on confirm.
+		setSnippetGithub_server(key, status).done(function(result) {
+			if (result.message) {
+				UIkit.notify(result.message, {status: result.status});
+				if ('success' === result.status) {
+					// get key ID
+					var keyID = getKeyID(key);
+					// update snippet if we can
+					updateSnippetDisplay(keyID, 'equal');
+				}
+			} else {
+				UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
+			}
+		});
+	});
+}
+
+function setSnippetGithub_server(path, status) {
+	// set the ajax scope
+	ajaxcall = null;
+	var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json";
+	if (token.length > 0 && path.length > 0 && status.length > 0) {
+		var request = 'token='+token+'&path='+path+'&status='+status;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+// update the snippet display
+function updateSnippetDisplay(keyID, status) {
+	// update badge
+	jQuery('#'+keyID+'-badge').html('<i class="uk-icon-info"></i> ' +status);
+	jQuery('#'+keyID+'-badge').attr('href' , '#'+status+'-meaning');
+	// update button
+	if ('equal' === status) {
+		// update notice
+		jQuery('#'+keyID+'-getbutton').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION'));
+		jQuery('#'+keyID+'-getbutton').prop('disabled', true);
+		jQuery('#'+keyID+'-getbutton').html('<i class="uk-icon-check-square-o"></i> ' + Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET'));
+		// counter delay just incase
+		setTimeout(function(){
+			jQuery('#'+keyID+'-getbutton').prop('disabled', true);
+		}, 2000);
+	}
+	// update the data filter
+	jQuery('#'+keyID+'-panel').attr('data-uk-filter', status);
+	// tell the grid to update
+	jQuery('#snippets-grid').trigger('display.uk.check');
+}
+
+// set the modal
+function getSnippetModal(key, type) {
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	var _snippet = jQuery.jStorage.get(key, null);
+	if (_snippet) {
+		// show modal
+		showSnippetModal(_snippet, type);
+	} else {
+		jQuery.get('https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/'+key)
+		.success(function(snippet) {
+			// convert the string to json.object
+			snippet = jQuery.parseJSON(snippet);
+			jQuery.jStorage.set(key, snippet, {TTL: expire});
+			// show modal
+			showSnippetModal(snippet, type);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			// we could do more
+		});
+	}
+}
+
+// show the modal
+function showSnippetModal(snippet, type) {
+	var html = '<div class="uk-modal-dialog uk-modal-dialog-lightbox">';
+	html += '<a href="" class="uk-modal-close uk-close uk-close-alt"></a>';
+	html += '<h3>' + snippet.library + ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
+	if ('contributor' === type) {
+		html += '<dl class="uk-description-list-line">';
+		html += '<dt><i class="uk-icon-institution"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_COMPANY_NAME')+'</dt>';
+		html += '<dd>'+snippet.contributor_company+'</dd>';
+		html += '<dt><i class="uk-icon-user"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_NAME')+'</dt>';
+		html += '<dd>'+snippet.contributor_name+'</dd>';
+		html += '<dt><i class="uk-icon-envelope-o"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_EMAIL')+'</dt>';
+		html += '<dd>'+snippet.contributor_email+'</dd>';
+		html += '<dt><i class="uk-icon-laptop"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_WEBSITE')+'</dt>';
+		html += '<dd>'+snippet.contributor_website+'</dd>';
+		html += '</dl>';
+	} else {
+		html += '<br /><textarea class="uk-width-1-1" rows="15" readonly>'+snippet[type]+'</textarea>';
+	}
+	html += '<br /><small>C: ' + snippet.created + ' | M: ' + snippet.modified + '</small>';
+	html += '</div>';
+	// get current page position
+	var scroll = jQuery(window).scrollTop();
+	// add html to modal
+	var modal = UIkit.modal.blockUI(html, {center:true, bgclose:true}).on({
+		'hide.uk.modal': function(){
+			// scroll fix since the modal pops to the top of the page
+			jQuery(window).scrollTop(scroll);
+		}
+	});
+	// show modal
+	modal.show();
+}
+
+// get key ID
+function getKeyID(key) {
+	// get useful ID
+	var keyID = key.replace('-', '');
+	keyID = keyID.replace('.json', '');
+	keyID = keyID.replace(/\s+/ig, '-');
+	keyID = keyID.replace(/\(/g, '');
+	keyID = keyID.replace(/\)/g, '');
+	// return the id build
+	return keyID;
+}

admin/compiler/joomla_3/JControllerLegacyHelp.php

@@ -51,7 +51,8 @@ class ###Component###ControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

admin/compiler/joomla_3/JControllerLegacyHelp_site.php

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

admin/compiler/joomla_3/JControllerLegacySITE.php

@@ -70,7 +70,6 @@ class ###Component###Controller extends JControllerLegacy
 				}
 				elseif (###Component###Helper::checkString($ref))
 				{
-
 					// redirect to ref
 					 $this->setRedirect(JRoute::_('index.php?option=com_###component###&view='.(string)$ref, false));
 				}

admin/compiler/joomla_3/JViewLegacy_list.php

@@ -56,7 +56,6 @@ class ###Component###View###Views### extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ###Component###Helper::getActions('###view###');###JVIEWLISTCANDO###
 
@@ -187,7 +186,7 @@ class ###Component###View###Views### extends JViewLegacy
 				'batch[access]',
 				JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')
 			);
-                } ###CATEGORYFILTER### ###OTHERFILTERS###
+		}###CATEGORYFILTER### ###OTHERFILTERS###
 	}
 
 	/**
@@ -231,5 +230,5 @@ class ###Component###View###Views### extends JViewLegacy
 	protected function getSortFields()
 	{
 		###SORTFIELDS###
-	} ###FILTERFUNCTIONS###
+	}###FILTERFUNCTIONS###
 }

admin/compiler/joomla_3/settings.json

@@ -53,162 +53,162 @@
 	"move": {
 		"static": {
 			"access.xml": {
-            "naam":"access.xml",
+				"naam": "access.xml",
 				"path": "c0mp0n3nt/admin",
 				"rename": false,
 				"type": "file"
 			},
 			"config.xml": {
-            "naam":"config.xml",
+				"naam": "config.xml",
 				"path": "c0mp0n3nt/admin",
 				"rename": false,
 				"type": "file"
 			},
 			"JControllerLegacy.php": {
-            "naam":"JControllerLegacy.php",
+				"naam": "JControllerLegacy.php",
 				"path": "c0mp0n3nt/admin",
 				"rename": "new",
 				"newName": "controller.php",
 				"type": "file"
 			},
 			"component.xml": {
-            "naam":"component.xml",
+				"naam": "component.xml",
 				"path": "c0mp0n3nt/",
 				"rename": "component",
 				"type": "file"
 			},
 			"component_admin.php": {
-            "naam":"component_admin.php",
+				"naam": "component_admin.php",
 				"path": "c0mp0n3nt/admin",
 				"rename": "component_admin",
 				"type": "file"
 			},
 			"admin.css": {
-            "naam":"admin.css",
+				"naam": "admin.css",
 				"path": "c0mp0n3nt/admin/assets/css",
 				"rename": false,
 				"type": "file"
 			},
 			"admin.js": {
-            "naam":"admin.js",
+				"naam": "admin.js",
 				"path": "c0mp0n3nt/admin/assets/js",
 				"rename": false,
 				"type": "file"
 			},
 			"site.css": {
-            "naam":"site.css",
+				"naam": "site.css",
 				"path": "c0mp0n3nt/site/assets/css",
 				"rename": false,
 				"type": "file"
 			},
 			"site.js": {
-            "naam":"site.js",
+				"naam": "site.js",
 				"path": "c0mp0n3nt/site/assets/js",
 				"rename": false,
 				"type": "file"
 			},
 			"batch_.php": {
-            "naam":"batch_.php",
+				"naam": "batch_.php",
 				"path": "c0mp0n3nt/admin/helpers/html",
 				"rename": false,
 				"type": "file"
 			},
 			"batchselection.php": {
-            "naam":"batchselection.php",
+				"naam": "batchselection.php",
 				"path": "c0mp0n3nt/admin/layouts",
 				"rename": false,
 				"type": "file"
 			},
 			"component_site.php": {
-            "naam":"component_site.php",
+				"naam": "component_site.php",
 				"path": "c0mp0n3nt/site",
 				"rename": "component_site",
 				"type": "file"
 			},
 			"router.php": {
-            "naam":"router.php",
+				"naam": "router.php",
 				"path": "c0mp0n3nt/site",
 				"rename": false,
 				"type": "file"
 			},
 			"routeHelper.php": {
-            "naam":"routeHelper.php",
+				"naam": "routeHelper.php",
 				"path": "c0mp0n3nt/site/helpers",
 				"rename": "new",
 				"newName": "route.php",
 				"type": "file"
 			},
 			"JControllerLegacySITE.php": {
-            "naam":"JControllerLegacySITE.php",
+				"naam": "JControllerLegacySITE.php",
 				"path": "c0mp0n3nt/site",
 				"rename": "new",
 				"newName": "controller.php",
 				"type": "file"
 			},
 			"Helper.php": {
-            "naam":"Helper.php",
+				"naam": "Helper.php",
 				"path": "c0mp0n3nt/admin/helpers",
 				"rename": "Helper",
 				"type": "file"
 			},
 			"Helper_site.php": {
-            "naam":"Helper_site.php",
+				"naam": "Helper_site.php",
 				"path": "c0mp0n3nt/site/helpers",
 				"rename": "Helper_site",
 				"type": "file"
 			},
 			"Helper_category.php": {
-            "naam":"Helper_category.php",
+				"naam": "Helper_category.php",
 				"path": "c0mp0n3nt/site/helpers",
 				"rename": "new",
 				"newName": "category.php",
 				"type": "file"
 			},
 			"script.php": {
-            "naam":"script.php",
+				"naam": "script.php",
 				"path": "c0mp0n3nt/",
 				"rename": false,
 				"type": "file"
 			},
 			"install.mysql.utf8.sql": {
-            "naam":"install.mysql.utf8.sql",
+				"naam": "install.mysql.utf8.sql",
 				"path": "c0mp0n3nt/admin/sql",
 				"rename": false,
 				"type": "file"
 			},
 			"uninstall.mysql.utf8.sql": {
-            "naam":"uninstall.mysql.utf8.sql",
+				"naam": "uninstall.mysql.utf8.sql",
 				"path": "c0mp0n3nt/admin/sql",
 				"rename": false,
 				"type": "file"
 			},
 			"headercheck_admin.php": {
-            "naam":"headercheck_admin.php",
+				"naam": "headercheck_admin.php",
 				"path": "c0mp0n3nt/admin/helpers",
 				"rename": "new",
 				"newName": "headercheck.php",
 				"type": "file"
 			},
 			"LICENSE.txt": {
-            "naam":"LICENSE.txt",
+				"naam": "LICENSE.txt",
 				"path": "c0mp0n3nt/",
 				"rename": false,
 				"type": "file"
 			},
 			"README.txt": {
-            "naam":"README.txt",
+				"naam": "README.txt",
 				"path": "c0mp0n3nt/admin",
 				"rename": false,
 				"type": "file"
 			},
 			"README.md": {
-            "naam":"README.md",
+				"naam": "README.md",
 				"path": "c0mp0n3nt/",
 				"rename": false,
 				"type": "file"
 			},
 			"headercheck.php": {
-            "naam":"headercheck.php",
+				"naam": "headercheck.php",
 				"path": "c0mp0n3nt/site/helpers",
 				"rename": false,
 				"type": "file"
@@ -665,6 +665,11 @@
 					"path": "c0mp0n3nt/site/helpers",
 					"rename": "Helper_category_view",
 					"type": "category"
+				},
+				"viewFileSite.js": {
+					"path": "c0mp0n3nt/site/assets/js",
+					"rename": "viewFileSite",
+					"type": "javascript_file"
 				}
 			},
 			"custom_admin": {
@@ -731,6 +736,11 @@
 					"path": "c0mp0n3nt/admin/layouts",
 					"rename": "layout_custom_admin",
 					"type": "layout"
+				},
+				"viewFileCustomAdmin.js": {
+					"path": "c0mp0n3nt/admin/assets/js",
+					"rename": "viewFileCustomAdmin",
+					"type": "javascript_file"
 				}
 			}
 		}

admin/compiler/joomla_3/viewFile.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###ADMINJS###

admin/compiler/joomla_3/viewFileCustomAdmin.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###CUSTOM_ADMIN_JAVASCRIPT_FILE###

admin/compiler/joomla_3/viewFileSite.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###SITE_JAVASCRIPT_FILE###

admin/controllers/help.php

@@ -48,7 +48,8 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

admin/helpers/compiler.php

@@ -1,5 +1,6 @@
 <?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -8,9 +9,9 @@
       \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
                                                       | |
                                                       |_|
-/-------------------------------------------------------------------------------------------------------------------------------/
+  /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -21,7 +22,7 @@
 
   Builds Complex Joomla Components
 
-/-----------------------------------------------------------------------------------------------------------------------------*/
+  /----------------------------------------------------------------------------------------------------------------------------- */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -39,6 +40,7 @@ class Compiler extends Infusion
 	 * 
 	 * @var      string
 	 */
+
 	private $tempPath;
 
 	/*
@@ -49,7 +51,6 @@ class Compiler extends Infusion
 	private $time_start;
 	private $time_end;
 	public $secondsCompiled;
-	
 	public $filepath = '';
 	// fixed pathes
 	protected $dynamicIntegration = false;
@@ -60,7 +61,7 @@ class Compiler extends Infusion
 	/**
 	 * Constructor
 	 */
-	public function __construct($config = array ())
+	public function __construct($config = array())
 	{
 		// to check the compiler speed
 		$this->time_start = microtime(true);
@@ -73,7 +74,7 @@ class Compiler extends Infusion
 			// set some folder paths in relation to distribution
 			if ($config['addBackup'])
 			{
-				$this->backupPath		= $this->params->get('backup_folder_path', $this->tempPath).'/'.$this->componentBackupName.'.zip';
+				$this->backupPath = $this->params->get('backup_folder_path', $this->tempPath) . '/' . $this->componentBackupName . '.zip';
 				$this->dynamicIntegration = true;
 			}
 			if ($config['addRepo'])
@@ -86,12 +87,12 @@ class Compiler extends Infusion
 				// first remove the files and folders
 				$this->removeFolder($this->componentPath . '/site');
 				// clear form component xml
-				$xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml';
+				$xmlPath = $this->componentPath . '/' . $this->fileContentStatic['###component###'] . '.xml';
 				$componentXML = ComponentbuilderHelper::getFileContents($xmlPath);
-				$textToSite = ComponentbuilderHelper::getBetween($componentXML,'<files folder="site">','</files>');
+				$textToSite = ComponentbuilderHelper::getBetween($componentXML, '<files folder="site">', '</files>');
-				$textToSiteLang = ComponentbuilderHelper::getBetween($componentXML,'<languages folder="site">','</languages>');
+				$textToSiteLang = ComponentbuilderHelper::getBetween($componentXML, '<languages folder="site">', '</languages>');
-				$componentXML = str_replace(array('<files folder="site">'.$textToSite."</files>", '<languages folder="site">'.$textToSiteLang."</languages>"), array('',''), $componentXML);
+				$componentXML = str_replace(array('<files folder="site">' . $textToSite . "</files>", '<languages folder="site">' . $textToSiteLang . "</languages>"), array('', ''), $componentXML);
-				$this->writeFile($xmlPath,$componentXML);
+				$this->writeFile($xmlPath, $componentXML);
 			}
 			// now update the files
 			if (!$this->updateFiles())
@@ -112,11 +113,9 @@ class Compiler extends Infusion
 				{
 					foreach ($this->langNot as $tag => $percentage)
 					{
-						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated, you will need to translate %s&#37; of the language strings before it will be added.', 
+						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated, you will need to translate %s&#37; of the language strings before it will be added.', $tag, $percentage, $this->percentageLanguageAdd), 'Warning');
-									$tag, $percentage, $this->percentageLanguageAdd), 'Warning');
 					}
-					$this->app->enqueueMessage(JText::sprintf('<b>You can change this percentage of translated strings required in the global options of JCB.</b><br />Please watch this <a href=%s>tutorial for more help surrounding the JCB translations manager</a>.', 
+					$this->app->enqueueMessage(JText::sprintf('<b>You can change this percentage of translated strings required in the global options of JCB.</b><br />Please watch this <a href=%s>tutorial for more help surrounding the JCB translations manager</a>.', '"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice');
-									'"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice');
 				}
 				// set why the strings were added
 				$whyAddedLang = JText::sprintf('because more then %s&#37; of the strings have been translated.', $this->percentageLanguageAdd);
@@ -129,8 +128,7 @@ class Compiler extends Infusion
 				{
 					foreach ($this->langSet as $tag => $percentage)
 					{
-						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated. Was addeded %s', 
+						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated. Was addeded %s', $tag, $percentage, $whyAddedLang), 'Notice');
-									$tag, $percentage, $whyAddedLang), 'Notice');
 					}
 				}
 			}
@@ -158,7 +156,7 @@ class Compiler extends Infusion
 					$mismatch = array_unique($this->langMismatch);
 				}
 				// set a notice if we have a mismatch
-				if (ComponentbuilderHelper::checkArray($mismatch))
+				if (isset($mismatch) && ComponentbuilderHelper::checkArray($mismatch))
 				{
 					if (count($mismatch) > 1)
 					{
@@ -171,9 +169,8 @@ class Compiler extends Infusion
 					// add the mismatching issues
 					foreach ($mismatch as $string)
 					{
-						$constant = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($string,'U');
+						$constant = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
-						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(\'%s\')</b> language constant for (%s) does not have a corresponding JText::Script() decalaration.', 
+						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(\'%s\')</b> language constant for (%s) does not have a corresponding JText::Script() decalaration.', $constant, $string), 'Warning');
-									$constant, $string), 'Warning');
 					}
 					$this->app->enqueueMessage('<hr />', 'Warning');
 				}
@@ -199,7 +196,7 @@ class Compiler extends Infusion
 	{
 		if ($this->debugLinenr)
 		{
-			return ' [Compiler '.$nr.']';	
+			return ' [Compiler ' . $nr . ']';
 		}
 		return '';
 	}
@@ -223,26 +220,26 @@ class Compiler extends Infusion
 				{
 					$this->fileContentStatic['###FILENAME###'] = $static['name'];
 					$php = '';
-					if (ComponentbuilderHelper::checkFileType($static['name'],'php'))
+					if (ComponentbuilderHelper::checkFileType($static['name'], 'php'))
 					{
 						$php = "<?php\n";
 					}
 					$string = ComponentbuilderHelper::getFileContents($static['path']);
-					if (strpos($string,'###BOM###') !== false)
+					if (strpos($string, '###BOM###') !== false)
 					{
-						list($wast,$code) = explode('###BOM###',$string);
+						list($wast, $code) = explode('###BOM###', $string);
-						$string = $php.$bom.$code;
+						$string = $php . $bom . $code;
 						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 						// add to zip array
-						$this->writeFile($static['path'],$answer);
+						$this->writeFile($static['path'], $answer);
 					}
 					else
 					{
 						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 						// add to zip array
-						$this->writeFile($static['path'],$answer);
+						$this->writeFile($static['path'], $answer);
 					}
-					$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL );
+					$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL);
 				}
 			}
 			// now we do the dynamic files
@@ -260,28 +257,28 @@ class Compiler extends Infusion
 								// do some weird stuff to improve the verion and dates being added to the license
 								$this->fixLicenseValues($file);
 								$php = '';
-								if (ComponentbuilderHelper::checkFileType($file['name'],'php'))
+								if (ComponentbuilderHelper::checkFileType($file['name'], 'php'))
 								{
 									$php = "<?php\n";
 								}
 								$string = ComponentbuilderHelper::getFileContents($file['path']);
-								if (strpos($string,'###BOM###') !== false)
+								if (strpos($string, '###BOM###') !== false)
 								{
-									list($bin,$code) = explode('###BOM###',$string);
+									list($bin, $code) = explode('###BOM###', $string);
-									$string = $php.$bom.$code;
+									$string = $php . $bom . $code;
 									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
 									// add to zip array
-									$this->writeFile($file['path'],$answer);
+									$this->writeFile($file['path'], $answer);
 								}
 								else
 								{
 									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
 									// add to zip array
-									$this->writeFile($file['path'],$answer);
+									$this->writeFile($file['path'], $answer);
 								}
-								$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL );
+								$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL);
 							}
 						}
 					}
@@ -307,7 +304,7 @@ class Compiler extends Infusion
 		// move the update server to host
 		if ($this->componentData->add_update_server == 1 && $this->componentData->update_server_target == 1 && isset($this->updateServerFileName) && $this->dynamicIntegration)
 		{
-			$xml_update_server_path = $this->componentPath.'/'.$this->updateServerFileName.'.xml';
+			$xml_update_server_path = $this->componentPath . '/' . $this->updateServerFileName . '.xml';
 			// make sure we have the correct file
 			if (JFile::exists($xml_update_server_path) && isset($this->componentData->update_server_ftp))
 			{
@@ -321,7 +318,7 @@ class Compiler extends Infusion
 					$this->componentData->update_server_ftp = rtrim($basic->decryptString($this->componentData->update_server_ftp), "\0");
 				}
 				// now move the file
-				$this->moveFileToFtpServer($xml_update_server_path,$this->componentData->update_server_ftp);
+				$this->moveFileToFtpServer($xml_update_server_path, $this->componentData->update_server_ftp);
 			}
 		}
 	}
@@ -345,7 +342,7 @@ class Compiler extends Infusion
 					}
 					else
 					{
-						$value = '@update number '.$value.' of this MVC';
+						$value = '@update number ' . $value . ' of this MVC';
 					}
 				}
 				$this->fileContentStatic[$key] = $value;
@@ -386,8 +383,8 @@ class Compiler extends Infusion
 		$this->actualHoursSpent = $this->actualTotalHours - $this->totalHours;
 		$this->actualDaysSpent = $this->actualTotalDays - $this->totalDays;
 		// calculate the projects actual time frame of completion
-		$this->projectWeekTime		= round($this->actualTotalDays / 5,1);
+		$this->projectWeekTime = round($this->actualTotalDays / 5, 1);
-		$this->projectMonthTime		= round($this->actualTotalDays / 24,1);		
+		$this->projectMonthTime = round($this->actualTotalDays / 24, 1);
 	}
 
 	private function buildReadMe()
@@ -421,7 +418,7 @@ class Compiler extends Infusion
 		// update the file
 		$answer = $this->setPlaceholders($string, $this->fileContentStatic);
 		// add to zip array
-		$this->writeFile($path,$answer);
+		$this->writeFile($path, $answer);
 	}
 
 	private function buildReadMeData()
@@ -468,14 +465,14 @@ class Compiler extends Infusion
 		if (ComponentbuilderHelper::checkString($this->repoPath))
 		{
 			// set the repo path
-			$repoFullPath = $this->repoPath.'/com_'.$this->componentData->sales_name.'__joomla_'.$this->joomlaVersion;
+			$repoFullPath = $this->repoPath . '/com_' . $this->componentData->sales_name . '__joomla_' . $this->joomlaVersion;
 			// remove old data
 			$this->removeFolder($repoFullPath, $this->componentData->toignore);
 			// set the new data
 			JFolder::copy($this->componentPath, $repoFullPath, '', true);
 		}
 		// the name of the zip file to create
-		$this->filepath = $this->tempPath.'/'.$this->componentFolderName.'.zip';
+		$this->filepath = $this->tempPath . '/' . $this->componentFolderName . '.zip';
 
 		//create the zip file
 		if (ComponentbuilderHelper::zip($this->componentPath, $this->filepath))
@@ -502,7 +499,7 @@ class Compiler extends Infusion
 						$this->componentData->sales_server_ftp = rtrim($basic->decryptString($this->componentData->sales_server_ftp), "\0");
 					}
 					// now move the file
-					$this->moveFileToFtpServer($this->filepath, $this->componentData->sales_server_ftp, $this->componentSalesName.'.zip',false);
+					$this->moveFileToFtpServer($this->filepath, $this->componentData->sales_server_ftp, $this->componentSalesName . '.zip', false);
 				}
 			}
 			// remove the component folder since we are done
@@ -522,7 +519,7 @@ class Compiler extends Infusion
 		if ($ftp instanceof JClientFtp && $ftp->isConnected())
 		{
 			// move the file
-			if ($ftp->store($localPath,$remote))
+			if ($ftp->store($localPath, $remote))
 			{
 				// if moved then remove the file from repository
 				if ($removeLocal)
@@ -587,15 +584,13 @@ class Compiler extends Infusion
 		// reset all these
 		$this->clearFromPlaceHolders('view');
 		$this->clearFromPlaceHolders('arg');
-		foreach($this->customCode as $nr => $target)
+		foreach ($this->customCode as $nr => $target)
 		{
 			// reset each time per custom code
 			$fingerPrint = array();
-			if (isset($target['hashtarget'][0]) && $target['hashtarget'][0] > 3 
+			if (isset($target['hashtarget'][0]) && $target['hashtarget'][0] > 3 && isset($target['path']) && ComponentbuilderHelper::checkString($target['path']) && isset($target['hashtarget'][1]) && ComponentbuilderHelper::checkString($target['hashtarget'][1]))
-				&& isset($target['path']) && ComponentbuilderHelper::checkString($target['path'])
-				&& isset($target['hashtarget'][1]) && ComponentbuilderHelper::checkString($target['hashtarget'][1]))
 			{
-				$file		= $this->componentPath . '/'. $target['path'];
+				$file = $this->componentPath . '/' . $target['path'];
 				$size = (int) $target['hashtarget'][0];
 				$hash = $target['hashtarget'][1];
 				$cut = $size - 1;
@@ -635,12 +630,12 @@ class Compiler extends Infusion
 							// check lines each time if it fits our target
 							if (count($fingerPrint) === $sizeEnd && !$foundEnd)
 							{
-								$fingerTest = md5(implode('',$fingerPrint));
+								$fingerTest = md5(implode('', $fingerPrint));
 								if ($fingerTest === $hashEnd)
 								{
 									// we are done here
 									$foundEnd = true;
-									$replace = array_slice($replace, 0, count($replace)-$sizeEnd);
+									$replace = array_slice($replace, 0, count($replace) - $sizeEnd);
 									break;
 								}
 								else
@@ -659,7 +654,7 @@ class Compiler extends Infusion
 						// check lines each time if it fits our target
 						if (count($fingerPrint) === $size && !$found)
 						{
-							$fingerTest = md5(implode('',$fingerPrint));
+							$fingerTest = md5(implode('', $fingerPrint));
 							if ($fingerTest === $hash)
 							{
 								// we are done here
@@ -680,8 +675,8 @@ class Compiler extends Infusion
 					}
 					if ($found)
 					{
-						$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
+						$placeholder = $this->getPlaceHolder((int) $target['comment_type'] . $target['type'], $target['id']);
-						$data		= $placeholder['start'] . PHP_EOL . $this->setPlaceholders($target['code'], $this->placeholders). $placeholder['end'] . PHP_EOL;
+						$data = $placeholder['start'] . PHP_EOL . $this->setPlaceholders($target['code'], $this->placeholders) . $placeholder['end'] . PHP_EOL;
 						if ($target['type'] == 2)
 						{
 							// found it now add code from the next line
@@ -732,12 +727,12 @@ class Compiler extends Infusion
 		$code = explode(PHP_EOL, $target['code']);
 		$code = PHP_EOL . $commentType . implode($_commentType . PHP_EOL . $commentType, $code) . $_commentType . PHP_EOL;
 		// get place holders
-		$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
+		$placeholder = $this->getPlaceHolder((int) $target['comment_type'] . $target['type'], $target['id']);
 		// build the data
-		$data		= $placeholder['start'] . $code . $placeholder['end']. PHP_EOL;
+		$data = $placeholder['start'] . $code . $placeholder['end'] . PHP_EOL;
 		// get the bites before insertion
 		$bitBucket = array();
-		foreach($lineBites as $line => $value)
+		foreach ($lineBites as $line => $value)
 		{
 			if ($line < $target['from_line'])
 			{
@@ -778,4 +773,5 @@ class Compiler extends Infusion
 
 		// any help to improve this is welcome...
 	}
+
 }

admin/helpers/compiler/b_Structure.php

@@ -1,5 +1,6 @@
 <?php
-/**--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -8,9 +9,9 @@
       \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
                                                       | |
                                                       |_|
-/-------------------------------------------------------------------------------------------------------------------------------/
+  /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -21,7 +22,7 @@
 
   Builds Complex Joomla Components
 
-/-----------------------------------------------------------------------------------------------------------------------------*/
+  /----------------------------------------------------------------------------------------------------------------------------- */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -31,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Structure extends Get
 {
+
 	/**
 	 * The foulder counter
 	 * 
@@ -314,7 +316,7 @@ class Structure extends Get
 	/**
 	 * Constructor
 	 */
-	public function __construct($config = array ())
+	public function __construct($config = array())
 	{
 		// first we run the perent constructor
 		if (parent::__construct($config))
@@ -324,16 +326,16 @@ class Structure extends Get
 			// set the Joomla version
 			$this->joomlaVersion = $config['joomlaVersion'];
 			// set the template path
-			$this->templatePath		= $this->compilerPath.'/joomla_'.$config['joomlaVersion'];
+			$this->templatePath = $this->compilerPath . '/joomla_' . $config['joomlaVersion'];
 			// set some default names
-			$this->componentSalesName	= 'com_'.$this->componentData->sales_name.'__J'.$this->joomlaVersion;
+			$this->componentSalesName = 'com_' . $this->componentData->sales_name . '__J' . $this->joomlaVersion;
-			$this->componentBackupName	= 'com_'.$this->componentData->sales_name.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion;
+			$this->componentBackupName = 'com_' . $this->componentData->sales_name . '_v' . str_replace('.', '_', $this->componentData->component_version) . '__J' . $this->joomlaVersion;
-			$this->componentFolderName	= 'com_'.$this->componentData->name_code.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion;
+			$this->componentFolderName = 'com_' . $this->componentData->name_code . '_v' . str_replace('.', '_', $this->componentData->component_version) . '__J' . $this->joomlaVersion;
 
 			// set component folder path
-			$this->componentPath		= $this->compilerPath.'/'.$this->componentFolderName;
+			$this->componentPath = $this->compilerPath . '/' . $this->componentFolderName;
 			// set the template path for custom
-			$this->templatePathCustom	= $this->params->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
+			$this->templatePathCustom = $this->params->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR . '/custom');
 			// make sure there is no old build
 			$this->removeFolder($this->componentPath);
 			// load the libraries files/folders and url's
@@ -372,7 +374,7 @@ class Structure extends Get
 	{
 		if ($this->debugLinenr)
 		{
-			return ' [Structure '.$nr.']';	
+			return ' [Structure ' . $nr . ']';
 		}
 		return '';
 	}
@@ -396,14 +398,14 @@ class Structure extends Get
 				$this->indexHTML('');
 			}
 			// create media path if not set
-			if (!JFolder::exists( $this->componentPath . '/media'))
+			if (!JFolder::exists($this->componentPath . '/media'))
 			{
 				JFolder::create($this->componentPath . '/media');
 				// count the folder created
 				$this->folderCount++;
 				$this->indexHTML('/media');
 			}
-			foreach($this->libraries as $id => &$library)
+			foreach ($this->libraries as $id => &$library)
 			{
 				if (ComponentbuilderHelper::checkObject($library))
 				{
@@ -429,7 +431,7 @@ class Structure extends Get
 					if (isset($library->urls) && ComponentbuilderHelper::checkArray($library->urls))
 					{
 						// build media folder path
-						$libFolder = strtolower( preg_replace('/\s+/', '-', ComponentbuilderHelper::safeString($library->name, 'filename', ' ', false)));
+						$libFolder = strtolower(preg_replace('/\s+/', '-', ComponentbuilderHelper::safeString($library->name, 'filename', ' ', false)));
 						$mediaPath = '/media/' . $libFolder;
 						// should we add the local folder
 						$addLocalFolder = false;
@@ -439,7 +441,7 @@ class Structure extends Get
 							if (isset($url['type']) && $url['type'] > 1 && isset($url['url']) && ComponentbuilderHelper::checkString($url['url']))
 							{
 								// create media/lib path if not set
-								if (!JFolder::exists( $this->componentPath . $mediaPath))
+								if (!JFolder::exists($this->componentPath . $mediaPath))
 								{
 									JFolder::create($this->componentPath . $mediaPath);
 									// count the folder created
@@ -491,7 +493,7 @@ class Structure extends Get
 							{
 								$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] = '';
 							}
-							$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$libFolder."</folder>";
+							$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL . "\t\t<folder>" . $libFolder . "</folder>";
 						}
 					}
 					// if config fields are found load into component config (avoiding dublicates)
@@ -499,7 +501,8 @@ class Structure extends Get
 					{
 						foreach ($library->config as $cofig)
 						{
-							$found = array_filter($this->componentData->config, function($item) use($cofig) {
+							$found = array_filter($this->componentData->config, function($item) use($cofig)
+							{
 								return $item['field'] == $cofig['field'];
 							});
 							// set the config data if not found
@@ -546,9 +549,9 @@ class Structure extends Get
 			// now build all folders needed for this component
 			foreach ($this->joomlaVersionData->create as $main => $folders)
 			{
-				if (!JFolder::exists($this->componentPath.'/'.$main))
+				if (!JFolder::exists($this->componentPath . '/' . $main))
 				{
-					JFolder::create($this->componentPath.'/'.$main);
+					JFolder::create($this->componentPath . '/' . $main);
 					// count the folder created
 					$this->folderCount++;
 					$this->indexHTML($main);
@@ -557,79 +560,79 @@ class Structure extends Get
 				{
 					foreach ($folders as $sub => $subFolders)
 					{
-						if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub))
+						if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub))
 						{
-							JFolder::create($this->componentPath.'/'.$main.'/'.$sub);
+							JFolder::create($this->componentPath . '/' . $main . '/' . $sub);
 							// count the folder created
 							$this->folderCount++;
-							$this->indexHTML($main.'/'.$sub);
+							$this->indexHTML($main . '/' . $sub);
 						}
 						if (ComponentbuilderHelper::checkObject($subFolders))
 						{
 							foreach ($subFolders as $sub_2 => $subFolders_2)
 							{
-								if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2))
+								if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2))
 								{
-									JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2);
+									JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2);
 									// count the folder created
 									$this->folderCount++;
-									$this->indexHTML($main.'/'.$sub.'/'.$sub_2);
+									$this->indexHTML($main . '/' . $sub . '/' . $sub_2);
 								}
 								if (ComponentbuilderHelper::checkObject($subFolders_2))
 								{
 									foreach ($subFolders_2 as $sub_3 => $subFolders_3)
 									{
 
-										if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3))
+										if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3))
 										{
-											JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3);
+											JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3);
 											// count the folder created
 											$this->folderCount++;
-											$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3);
+											$this->indexHTML($main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3);
 										}
 										if (ComponentbuilderHelper::checkObject($subFolders_3))
 										{
 											foreach ($subFolders_3 as $sub_4 => $subFolders_4)
 											{
-												if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4))
+												if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4))
 												{
-													JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4);
+													JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4);
 													// count the folder created
 													$this->folderCount++;
-													$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4);
+													$this->indexHTML($main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4);
 												}
 												if (ComponentbuilderHelper::checkObject($subFolders_4))
 												{
 													foreach ($subFolders_4 as $sub_5 => $subFolders_5)
 													{
-														if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5))
+														if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5))
 														{
-															JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5);
+															JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5);
 															// count the folder created
 															$this->folderCount++;
-															$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5);
+															$this->indexHTML($main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5);
 														}
 														if (ComponentbuilderHelper::checkObject($subFolders_5))
 														{
 															foreach ($subFolders_5 as $sub_6 => $subFolders_6)
 															{
-																if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6))
+																if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6))
 																{
-																	JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6);
+																	JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6);
 																	// count the folder created
 																	$this->folderCount++;
-																	$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6);
+																	$this->indexHTML($main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6);
 																}
 																if (ComponentbuilderHelper::checkObject($subFolders_6))
 																{
 																	foreach ($subFolders_6 as $sub_7 => $subFolders_7)
 																	{
-																		if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7))
+																		if (!JFolder::exists($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6 . '/' . $sub_7))
 																		{
-																			JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7);
+																			JFolder::create($this->componentPath . '/' . $main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6 . '/' . $sub_7);
 																			// count the folder created
 																			$this->folderCount++;
-																			$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7);
+																			$this->indexHTML($main . '/' . $sub . '/' . $sub_2 . '/' . $sub_3 . '/' . $sub_4 . '/' . $sub_5 . '/' . $sub_6 . '/' . $sub_7);
 																		}
 																	}
 																}
@@ -668,7 +671,7 @@ class Structure extends Get
 			// do license check
 			$LICENSE = false;
 			$licenseChecker = strtolower($this->componentData->license);
-			if (strpos($licenseChecker,'gnu') !== false && strpos($licenseChecker,'gpl') !== false)
+			if (strpos($licenseChecker, 'gnu') !== false && strpos($licenseChecker, 'gpl') !== false)
 			{
 				$LICENSE = true;
 			}
@@ -711,27 +714,27 @@ class Structure extends Get
 					continue;
 				}
 				// set destination path
-				$zipPath	= str_replace('c0mp0n3nt/','', $details->path);
+				$zipPath = str_replace('c0mp0n3nt/', '', $details->path);
-				$path		= str_replace('c0mp0n3nt/',$this->componentPath.'/', $details->path);
+				$path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $details->path);
 				// set the template folder path
 				$templatePath = (isset($details->custom) && $details->custom) ? $this->templatePathCustom : $this->templatePath;
 				// now mov the file
 				if ($details->type === 'file')
 				{
 					// move the file to its place
-					JFile::copy($templatePath.'/'.$item, $path.'/'.$new);
+					JFile::copy($templatePath . '/' . $item, $path . '/' . $new);
 					// count the file created
 					$this->fileCount++;
 					// store the new files
-					if (!in_array($ftem,$this->notNew))
+					if (!in_array($ftem, $this->notNew))
 					{
-						$this->newFiles['static'][] = array( 'path' => $path.'/'.$new, 'name' => $new, 'zip' => $zipPath.'/'.$new );
+						$this->newFiles['static'][] = array('path' => $path . '/' . $new, 'name' => $new, 'zip' => $zipPath . '/' . $new);
 					}
 				}
 				elseif ($details->type === 'folder')
 				{
 					// move the folder to its place
-					JFolder::copy($templatePath.'/'.$item, $path.'/'.$new);
+					JFolder::copy($templatePath . '/' . $item, $path . '/' . $new);
 					// count the folder created
 					$this->folderCount++;
 				}
@@ -755,7 +758,7 @@ class Structure extends Get
 		{
 			// setup dashboard
 			$target = array('admin' => $this->componentData->name_code);
-			$this->buildDynamique($target,'dashboard');
+			$this->buildDynamique($target, 'dashboard');
 			// now the rest of the views
 			foreach ($this->componentData->admin_views as $nr => $view)
 			{
@@ -766,21 +769,21 @@ class Structure extends Get
 					if ($view['settings']->name_list != 'null')
 					{
 						$target = array('admin' => $view['settings']->name_list);
-						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-						$this->buildDynamique($target,'list', false, $config);
+						$this->buildDynamique($target, 'list', false, $config);
 					}
 					if ($view['settings']->name_single != 'null')
 					{
 						$target = array('admin' => $view['settings']->name_single);
-						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-						$this->buildDynamique($target,'single', false, $config);
+						$this->buildDynamique($target, 'single', false, $config);
 					}
-					if ( isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
+					if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
 					{
 						// setup the front site edit-view files
 						$target = array('site' => $view['settings']->name_single);
-						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-						$this->buildDynamique($target,'edit', false, $config);
+						$this->buildDynamique($target, 'edit', false, $config);
 					}
 				}
 				// quick set of checkin once
@@ -803,15 +806,15 @@ class Structure extends Get
 				{
 					// set list view
 					$target = array('site' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-					$this->buildDynamique($target,'list', false, $config);
+					$this->buildDynamique($target, 'list', false, $config);
 				}
 				elseif ($view['settings']->main_get->gettype == 1)
 				{
 					// set single view
 					$target = array('site' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-					$this->buildDynamique($target,'single', false, $config);
+					$this->buildDynamique($target, 'single', false, $config);
 				}
 			}
 			$front = true;
@@ -826,14 +829,14 @@ class Structure extends Get
 				{
 					// set list view$view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
-					$this->buildDynamique($target,'list', false, $config);
+					$this->buildDynamique($target, 'list', false, $config);
 				}
 				elseif ($view['settings']->main_get->gettype == 1)
 				{
 					// set single view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target, 'single', false, $config);
 				}
 			}
@@ -881,9 +884,7 @@ class Structure extends Get
 	public function getLastModifiedDate($view)
 	{
 		// first set the main date
-		if (isset($view['settings']->modified) 
+		if (isset($view['settings']->modified) && ComponentbuilderHelper::checkString($view['settings']->modified) && '0000-00-00 00:00:00' !== $view['settings']->modified)
-			&& ComponentbuilderHelper::checkString($view['settings']->modified) 
-			&& '0000-00-00 00:00:00' !== $view['settings']->modified)
 		{
 			$date = strtotime($view['settings']->modified);
 		}
@@ -895,7 +896,7 @@ class Structure extends Get
 		// search for the last modified date
 		if (isset($view['adminview']))
 		{
-			$id = $view['adminview'].'admin';
+			$id = $view['adminview'] . 'admin';
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
@@ -903,9 +904,7 @@ class Structure extends Get
 				{
 					foreach ($view['settings']->fields as $field)
 					{
-						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) 
+						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) && isset($field['settings']->modified) && ComponentbuilderHelper::checkString($field['settings']->modified) && '0000-00-00 00:00:00' !== $field['settings']->modified)
-							&& isset($field['settings']->modified) && ComponentbuilderHelper::checkString($field['settings']->modified) 
-							&& '0000-00-00 00:00:00' !== $field['settings']->modified)
 						{
 							$anotherDate = strtotime($field['settings']->modified);
 							if ($anotherDate > $date)
@@ -919,13 +918,11 @@ class Structure extends Get
 		}
 		elseif (isset($view['siteview']))
 		{
-			$id = $view['siteview'].'site';
+			$id = $view['siteview'] . 'site';
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified)
+				if (isset($view['settings']->main_get->modified) && ComponentbuilderHelper::checkString($view['settings']->main_get->modified) && '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
-					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
-					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)
@@ -937,13 +934,11 @@ class Structure extends Get
 		}
 		elseif (isset($view['customadminview']))
 		{
-			$id = $view['customadminview'].'customadmin';
+			$id = $view['customadminview'] . 'customadmin';
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified)
+				if (isset($view['settings']->main_get->modified) && ComponentbuilderHelper::checkString($view['settings']->main_get->modified) && '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
-					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
-					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)
@@ -993,16 +988,16 @@ class Structure extends Get
 					{
 						// set destination path
 						$path = '';
-						if (strpos($details->path,'VIEW') !== false)
+						if (strpos($details->path, 'VIEW') !== false)
 						{
-							$path = str_replace('VIEW',$name,$details->path);
+							$path = str_replace('VIEW', $name, $details->path);
 						}
 						else
 						{
 							$path = $details->path;
 						}
-						$zipPath	= str_replace('c0mp0n3nt/','', $path);
+						$zipPath = str_replace('c0mp0n3nt/', '', $path);
-						$path		= str_replace('c0mp0n3nt/',$this->componentPath.'/', $path);
+						$path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $path);
 
 						// setup the folder
 						if (!JFolder::exists($path))
@@ -1018,7 +1013,7 @@ class Structure extends Get
 							if ($fileName)
 							{
 								$new = str_replace($details->rename, $fileName, $item);
-								$name = $name.'_'.$fileName;
+								$name = $name . '_' . $fileName;
 							}
 							elseif ($details->rename === 'new')
 							{
@@ -1033,15 +1028,15 @@ class Structure extends Get
 						{
 							$new = $item;
 						}
-						if (!JFile::exists($path.'/'.$new))
+						if (!JFile::exists($path . '/' . $new))
 						{
 							// move the file to its place
-							JFile::copy($this->templatePath.'/'.$item, $path.'/'.$new,'',true);
+							JFile::copy($this->templatePath . '/' . $item, $path . '/' . $new, '', true);
 							// count the file created
 							$this->fileCount++;
 						}
 						// setup array for new file
-						$newFIle = array( 'path' => $path.'/'.$new, 'name' => $new , 'view' => $name, 'zip' => $zipPath.'/'.$new);
+						$newFIle = array('path' => $path . '/' . $new, 'name' => $new, 'view' => $name, 'zip' => $zipPath . '/' . $new);
 						if (ComponentbuilderHelper::checkArray($config))
 						{
 							$newFIle['config'] = $config;
@@ -1066,41 +1061,41 @@ class Structure extends Get
 	private function setJoomlaVersionData()
 	{
 		// set the version data
-		$versionData = json_decode(ComponentbuilderHelper::getFileContents($this->templatePath.'/settings.json'));
+		$versionData = json_decode(ComponentbuilderHelper::getFileContents($this->templatePath . '/settings.json'));
 		// add custom folders
 		if ((isset($this->componentData->folders) && ComponentbuilderHelper::checkArray($this->componentData->folders)) || $this->addEximport || $this->uikit || $this->footable)
 		{
 			if ($this->addEximport)
 			{
 				// move the import view folder in place
-				$importView = array( 'folder' => 'importViews', 'path' => 'admin/views/import', 'rename' => 1);
+				$importView = array('folder' => 'importViews', 'path' => 'admin/views/import', 'rename' => 1);
 				$this->componentData->folders[] = $importView;
 				// move the PHPExel Folder
-				$PHPExcel = array( 'folder' => 'PHPExcel', 'path' => 'admin/helpers', 'rename' => 0);
+				$PHPExcel = array('folder' => 'PHPExcel', 'path' => 'admin/helpers', 'rename' => 0);
 				$this->componentData->folders[] = $PHPExcel;
 			}
 			if (2 == $this->uikit || 1 == $this->uikit)
 			{
 				// move the UIKIT Folder into place
-				$uikit = array( 'folder' => 'uikit-v2', 'path' => 'media', 'rename' => 0);
+				$uikit = array('folder' => 'uikit-v2', 'path' => 'media', 'rename' => 0);
 				$this->componentData->folders[] = $uikit;
 			}
 			if (2 == $this->uikit || 3 == $this->uikit)
 			{
 				// move the UIKIT-3 Folder into place
-				$uikit = array( 'folder' => 'uikit-v3', 'path' => 'media', 'rename' => 0);
+				$uikit = array('folder' => 'uikit-v3', 'path' => 'media', 'rename' => 0);
 				$this->componentData->folders[] = $uikit;
 			}
 			if ($this->footable && (!isset($this->footableVersion) || 2 == $this->footableVersion))
 			{
 				// move the footable folder into place
-				$footable = array( 'folder' => 'footable-v2', 'path' => 'media', 'rename' => 0);
+				$footable = array('folder' => 'footable-v2', 'path' => 'media', 'rename' => 0);
 				$this->componentData->folders[] = $footable;
 			}
 			elseif ($this->footable && 3 == $this->footableVersion)
 			{
 				// move the footable folder into place
-				$footable = array( 'folder' => 'footable-v3', 'path' => 'media', 'rename' => 0);
+				$footable = array('folder' => 'footable-v3', 'path' => 'media', 'rename' => 0);
 				$this->componentData->folders[] = $footable;
 			}
 
@@ -1112,16 +1107,16 @@ class Structure extends Get
 				$custom['path'] = rtrim($custom['path'], '/');
 				$custom['path'] = ltrim($custom['path'], '/');
 				// make sure we use the correct name
-				$pathArray = (array) explode('/',$custom['path']);
+				$pathArray = (array) explode('/', $custom['path']);
 				$firstFolder = array_values($pathArray)[0];
 				$lastFolder = end($pathArray);
 				// only rename folder if last has folder name
 				if (isset($custom['rename']) && $custom['rename'] == 1)
 				{
-					$custom['path'] = str_replace('/'.$lastFolder,'',$custom['path']);
+					$custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']);
 					$rename = 'new';
 					$newname = $lastFolder;
-					if(($tkey = array_search($lastFolder, $pathArray)) !== false)
+					if (($tkey = array_search($lastFolder, $pathArray)) !== false)
 					{
 						unset($pathArray[$tkey]);
 					}
@@ -1139,7 +1134,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'media')
 				{
-					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL . "\t\t<folder>" . $lastFolder . "</folder>";
 				}
 				// check if we sould add it to the site xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_SITE_FOLDERS###']))
@@ -1148,7 +1143,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'site')
 				{
-					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL . "\t\t<folder>" . $lastFolder . "</folder>";
 				}
 				// check if we sould add it to the admin xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###']))
@@ -1157,15 +1152,15 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'admin')
 				{
-					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL."\t\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL . "\t\t\t<folder>" . $lastFolder . "</folder>";
 				}
 				// make we have not duplicates
-				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']).'_f'.$pointer_tracker;
+				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']) . '_f' . $pointer_tracker;
 				$pointer_tracker++;
 				// set new folder to object
 				$versionData->move->static->$key_pointer = new stdClass();
 				$versionData->move->static->$key_pointer->naam = $custom['folder'];
-				$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$custom['path'];
+				$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $custom['path'];
 				$versionData->move->static->$key_pointer->rename = $rename;
 				$versionData->move->static->$key_pointer->newName = $newname;
 				$versionData->move->static->$key_pointer->type = 'folder';
@@ -1180,15 +1175,15 @@ class Structure extends Get
 			if ($this->addEximport)
 			{
 				// move the PHPExel main file
-				$PHPExcel = array( 'file' => 'PHPExcel.php', 'path' => 'admin/helpers', 'rename' => 0);
+				$PHPExcel = array('file' => 'PHPExcel.php', 'path' => 'admin/helpers', 'rename' => 0);
 				$this->componentData->files[] = $PHPExcel;
 			}
 			if ($this->googlechart)
 			{
 				// move the google chart files
-				$googleChart = array( 'file' => 'google.jsapi.js', 'path' => 'media/js', 'rename' => 0);
+				$googleChart = array('file' => 'google.jsapi.js', 'path' => 'media/js', 'rename' => 0);
 				$this->componentData->files[] = $googleChart;
-				$googleChart = array( 'file' => 'chartbuilder.php', 'path' => 'admin/helpers', 'rename' => 0);
+				$googleChart = array('file' => 'chartbuilder.php', 'path' => 'admin/helpers', 'rename' => 0);
 				$this->componentData->files[] = $googleChart;
 			}
 
@@ -1197,7 +1192,7 @@ class Structure extends Get
 			foreach ($this->componentData->files as $custom)
 			{
 				// make we have not duplicates
-				$key_pointer = ComponentbuilderHelper::safeString($custom['file']).'_g'.$pointer_tracker;
+				$key_pointer = ComponentbuilderHelper::safeString($custom['file']) . '_g' . $pointer_tracker;
 				$pointer_tracker++;
 				// set new file to object
 				$versionData->move->static->$key_pointer = new stdClass();
@@ -1208,7 +1203,7 @@ class Structure extends Get
 				{
 					$pathInfo['dirname'] = rtrim($pathInfo['dirname'], '/');
 					$pathInfo['dirname'] = ltrim($pathInfo['dirname'], '/');
-					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$pathInfo['dirname'];
+					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $pathInfo['dirname'];
 					$versionData->move->static->$key_pointer->rename = 'new';
 					$versionData->move->static->$key_pointer->newName = $pathInfo['basename'];
 					// set the name
@@ -1218,7 +1213,7 @@ class Structure extends Get
 				{
 					$custom['path'] = rtrim($custom['path'], '/');
 					$custom['path'] = ltrim($custom['path'], '/');
-					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$custom['path'];
+					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $custom['path'];
 					$versionData->move->static->$key_pointer->rename = false;
 					// set the name
 					$name = $custom['file'];
@@ -1249,13 +1244,13 @@ class Structure extends Get
 	{
 		if (strlen($path) > 0)
 		{
-			JFile::copy($this->templatePath.'/index.html', $this->componentPath.'/'.$path.'/index.html');
+			JFile::copy($this->templatePath . '/index.html', $this->componentPath . '/' . $path . '/index.html');
 			// count the file created
 			$this->fileCount++;
 		}
 		else
 		{
-			JFile::copy($this->templatePath.'/index.html', $this->componentPath.'/index.html');
+			JFile::copy($this->templatePath . '/index.html', $this->componentPath . '/index.html');
 			// count the file created
 			$this->fileCount++;
 		}

admin/helpers/compiler/c_Fields.php

@@ -1,5 +1,6 @@
 <?php
-/**--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -8,9 +9,9 @@
       \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
                                                       | |
                                                       |_|
-/-------------------------------------------------------------------------------------------------------------------------------/
+  /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -21,7 +22,7 @@
 
   Builds Complex Joomla Components
 
-/-----------------------------------------------------------------------------------------------------------------------------*/
+  /----------------------------------------------------------------------------------------------------------------------------- */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -31,12 +32,12 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Fields extends Structure
 {
+
 	/**
 	 * Metadate Switch
 	 * 
 	 * @var    array
 	 */
-
 	public $metadataBuilder = array();
 
 	/**
@@ -366,7 +367,7 @@ class Fields extends Structure
 	{
 		if ($this->debugLinenr)
 		{
-			return ' [Fields '.$nr.']';	
+			return ' [Fields ' . $nr . ']';
 		}
 		return '';
 	}
@@ -807,7 +808,7 @@ class Fields extends Structure
 			if (ComponentbuilderHelper::checkArray($fieldAttributes))
 			{
 				// set the array of field names
-				$this->setFieldsNames($viewName,$fieldAttributes['name']);
+				$this->setFieldsNames($viewName, $fieldAttributes['name']);
 
 				if ($this->defaultField($typeName, 'option'))
 				{
@@ -1248,7 +1249,7 @@ class Fields extends Structure
 	 * @return  void
 	 *
 	 */
-	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
+	public function setLayoutBuilder(&$viewName, &$tabName, &$name, &$field)
 	{
 		// first fix the zero order
 		// to insure it lands before all the other fields
@@ -1338,14 +1339,14 @@ class Fields extends Structure
 	 */
 	public function buildSiteFieldData($view, $field, $set, $type)
 	{
-		$decode = array('json','base64','basic_encryption','advance_encryption');
+		$decode = array('json', 'base64', 'basic_encryption', 'advance_encryption');
-		$textareas = array('textarea','editor');
+		$textareas = array('textarea', 'editor');
 		if (isset($this->siteFields[$view][$field]) && ComponentbuilderHelper::checkArray($this->siteFields[$view][$field]))
 		{
 			foreach ($this->siteFields[$view][$field] as $code => $array)
 			{
 				// set the decoding methods
-				if (in_array($set,$decode))
+				if (in_array($set, $decode))
 				{
 					$this->siteFieldData['decode'][$array['site']][$code][$array['as']][$array['key']] = array('decode' => $set, 'type' => $type);
 				}
@@ -1793,7 +1794,7 @@ class Fields extends Structure
 			return;
 		}
 		// count how many times the field is used
-		$this->uniqueNames[$view]['counter'][$name]++;
+		$this->uniqueNames[$view]['counter'][$name] ++;
 		return;
 	}
 
@@ -1825,7 +1826,6 @@ class Fields extends Structure
 		return $name;
 	}
 
-	
 	/**
 	 * set Builders
 	 *
@@ -2156,11 +2156,11 @@ class Fields extends Structure
 	public function setCustomFieldTypeFile($data, $viewName_list, $viewName_single)
 	{
 		// make sure it is not already been build
-		if (!isset($this->fileContentDynamic['customfield_'.$data['type']]) || !ComponentbuilderHelper::checkArray($this->fileContentDynamic['customfield_'.$data['type']]))
+		if (!isset($this->fileContentDynamic['customfield_' . $data['type']]) || !ComponentbuilderHelper::checkArray($this->fileContentDynamic['customfield_' . $data['type']]))
 		{
 			// first build the custom field type file
 			$target = array('admin' => 'customfield');
-			$this->buildDynamique($target,'field'.$data['custom']['extends'], $data['custom']['type']);
+			$this->buildDynamique($target, 'field' . $data['custom']['extends'], $data['custom']['type']);
 			// set tab and break replacements
 			$tabBreak = array(
 				'\t' => "\t",
@@ -2171,11 +2171,11 @@ class Fields extends Structure
 				'###TABLE###' => $data['custom']['table'],
 				'###ID###' => $data['custom']['id'],
 				'###TEXT###' => $data['custom']['text'],
-				'###CODE_TEXT###' => $data['code'].'_'.$data['custom']['text'],
+				'###CODE_TEXT###' => $data['code'] . '_' . $data['custom']['text'],
 				'###CODE###' => $data['code'],
 				'###component###' => $this->fileContentStatic['###component###'],
 				'###Component###' => $this->fileContentStatic['###Component###'],
-				'###view_type###' => $viewName_single.'_'.$data['type'],
+				'###view_type###' => $viewName_single . '_' . $data['type'],
 				'###type###' => $data['type'],
 				'###view###' => $viewName_single,
 				'###views###' => $viewName_list
@@ -2195,7 +2195,7 @@ class Fields extends Structure
 						}
 						else
 						{
-							$phpCode .= PHP_EOL."\t\t".$this->setPlaceholders($code, $tabBreak);
+							$phpCode .= PHP_EOL . "\t\t" . $this->setPlaceholders($code, $tabBreak);
 						}
 					}
 				}
@@ -2244,30 +2244,30 @@ class Fields extends Structure
 					$phpxCode = 'return null;';
 				}
 				// temp holder for name
-				$tempName = $data['custom']['label'].' Group';
+				$tempName = $data['custom']['label'] . ' Group';
 				// set lang
-				$groupLangName = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($tempName,'U');
+				$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
 				// add to lang array
-				$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName,'W');
+				$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
 				// build the Group Control
 				$this->setGroupControl[$data['type']] = $groupLangName;
 				// ###JFORM_GETGROUPS_PHP### <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_'.$data['type']]['###JFORM_GETGROUPS_PHP###'] = $phpCode;
+				$this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETGROUPS_PHP###'] = $phpCode;
 
 				// ###JFORM_GETEXCLUDED_PHP### <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_'.$data['type']]['###JFORM_GETEXCLUDED_PHP###'] = $phpxCode;
+				$this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETEXCLUDED_PHP###'] = $phpxCode;
 			}
 			else
 			{
 				// ###JFORM_GETOPTIONS_PHP### <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_'.$data['type']]['###JFORM_GETOPTIONS_PHP###'] = $phpCode;
+				$this->fileContentDynamic['customfield_' . $data['type']]['###JFORM_GETOPTIONS_PHP###'] = $phpCode;
 			}
 			// ###Type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_'.$data['type']]['###Type###'] = ComponentbuilderHelper::safeString($data['custom']['type'],'F');
+			$this->fileContentDynamic['customfield_' . $data['type']]['###Type###'] = ComponentbuilderHelper::safeString($data['custom']['type'], 'F');
 			// ###type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_'.$data['type']]['###type###'] = $data['custom']['type'];
+			$this->fileContentDynamic['customfield_' . $data['type']]['###type###'] = $data['custom']['type'];
 			// ###type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_'.$data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view'],$data['custom']['views']);
+			$this->fileContentDynamic['customfield_' . $data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view'], $data['custom']['views']);
 		}
 	}
 
@@ -2415,9 +2415,9 @@ class Fields extends Structure
 		if ($this->tidy)
 		{
 			$tidy = new Tidy();
-			$tidy->parseString($xmlString,array('indent'=>true,'indent-spaces'=>8,'input-xml'=>true,'output-xml'=>true,'indent-attributes'=>true,'wrap-attributes'=>true,'wrap'=>false));
+			$tidy->parseString($xmlString, array('indent' => true, 'indent-spaces' => 8, 'input-xml' => true, 'output-xml' => true, 'indent-attributes' => true, 'wrap-attributes' => true, 'wrap' => false));
 			$tidy->cleanRepair();
-			return $this->xmlIndent((string)$tidy,' ',8,true,false);
+			return $this->xmlIndent((string) $tidy, ' ', 8, true, false);
 		}
 		// set tidy waring atleast once
 		elseif (!$this->setTidyWarning)
@@ -2442,18 +2442,18 @@ class Fields extends Structure
 	 * @return  string XML output
 	 *
 	 */
-	public function xmlIndent($string,$char=' ',$depth=0,$skipfirst=false,$skiplast=false)
+	public function xmlIndent($string, $char = ' ', $depth = 0, $skipfirst = false, $skiplast = false)
 	{
 		$output = array();
-		$lines = explode("\n",$string);
+		$lines = explode("\n", $string);
 		$first = true;
-		$last = count($lines)-1;
+		$last = count($lines) - 1;
-		foreach($lines as $i=>$line)
+		foreach ($lines as $i => $line)
 		{
-			$output[] = (($first&&$skipfirst)||$i===$last&&$skiplast)?$line:str_repeat($char,$depth).$line;
+			$output[] = (($first && $skipfirst) || $i === $last && $skiplast) ? $line : str_repeat($char, $depth) . $line;
 			$first = false;
 		}
-		return implode("\n",$output);
+		return implode("\n", $output);
 	}
 
 }

admin/helpers/compiler/f_Infusion.php

@@ -1,5 +1,6 @@
 <?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -8,9 +9,9 @@
       \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
                                                       | |
                                                       |_|
-/-------------------------------------------------------------------------------------------------------------------------------/
+  /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -21,7 +22,7 @@
 
   Builds Complex Joomla Components
 
-/-----------------------------------------------------------------------------------------------------------------------------*/
+  /----------------------------------------------------------------------------------------------------------------------------- */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -42,7 +43,7 @@ class Infusion extends Interpretation
 	/**
 	 * Constructor
 	 */
-	public function __construct($config = array ())
+	public function __construct($config = array())
 	{
 		// first we run the perent constructor
 		if (parent::__construct($config))
@@ -65,7 +66,7 @@ class Infusion extends Interpretation
 	{
 		if ($this->debugLinenr)
 		{
-			return ' [Infusion '.$nr.']';	
+			return ' [Infusion ' . $nr . ']';
 		}
 		return '';
 	}
@@ -134,7 +135,7 @@ class Infusion extends Interpretation
 			// load only the first value
 			elseif (isset($versionArray) && ComponentbuilderHelper::checkArray($versionArray) && $this->componentData->mvc_versiondate == 3)
 			{
-				$this->fileContentStatic['###VERSION###'] = $versionArray[0]. '.x.x';
+				$this->fileContentStatic['###VERSION###'] = $versionArray[0] . '.x.x';
 			}
 			unset($versionArray);
 
@@ -177,12 +178,10 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 
 			// ###CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] 
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
-				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
 
 			// ###BOTH_CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] 
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
-				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
 
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
@@ -197,24 +196,22 @@ class Infusion extends Interpretation
 			if ($this->componentData->add_admin_event == 1)
 			{
 				// ###ADMIN_GLOBAL_EVENT###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Admin Event';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL . PHP_EOL . '// Triger the Global Admin Event';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] 
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= PHP_EOL . $this->fileContentStatic['###Component###'] . 'Helper::globalEvent($document);';
-					.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 				// ###ADMIN_GLOBAL_EVENT_HELPER###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL . PHP_EOL . "\t" . '/**';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Admin Event Method.';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '*	The Global Admin Event Method.';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '**/';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . 'public static function globalEvent($document)';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '{';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] 
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . $this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
-					.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '}';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 			}
 
 			// now load the readme file if needed
 			if ($this->componentData->addreadme == 1)
 			{
-				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= PHP_EOL."\t\t\t<filename>README.txt</filename>";
+				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= PHP_EOL . "\t\t\t<filename>README.txt</filename>";
 			}
 
 			// ###HELPER_CREATEUSER###
@@ -250,26 +247,26 @@ class Infusion extends Interpretation
 				// set site edit view array
 				if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
 				{
-                                        $site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'";
+					$site_edit_view_array[] = "\t\t\t\t'" . $viewName_single . "'";
 					$this->lang = 'both';
 				}
 				// check if help is being loaded
 				$this->checkHelp($viewName_single);
 				// set custom admin view list links
-                                $this->setCustomAdminViewListLink($view,$viewName_list);
+				$this->setCustomAdminViewListLink($view, $viewName_list);
 
 				// set view array
-                                $viewarray[] = "\t\t\t\t'".$viewName_single."' => '".$viewName_list."'";
+				$viewarray[] = "\t\t\t\t'" . $viewName_single . "' => '" . $viewName_list . "'";
 				// set the view names
 				if ($view['settings']->name_single != 'null')
 				{
 					// ###VIEW### <<<DYNAMIC>>>
-                                        $viewName_u = ComponentbuilderHelper::safeString($view['settings']->name_single,'U');
+					$viewName_u = ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
 					$this->fileContentDynamic[$viewName_single]['###VIEW###'] = $viewName_u;
 					$this->fileContentDynamic[$viewName_list]['###VIEW###'] = $viewName_u;
 
 					// ###View### <<<DYNAMIC>>>
-                                        $viewName_f = ComponentbuilderHelper::safeString($view['settings']->name_single,'F');
+					$viewName_f = ComponentbuilderHelper::safeString($view['settings']->name_single, 'F');
 					$this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f;
 					$this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f;
 
@@ -290,8 +287,7 @@ class Infusion extends Interpretation
 					$this->setLockLicensePer($viewName_list, $this->target);
 
 					// ###FIELDSETS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] 
+					$this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
-						= $this->setFieldSet($view, $this->fileContentStatic['###component###']);
 
 					// ###ACCESSCONTROL### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single);
@@ -314,15 +310,12 @@ class Infusion extends Interpretation
 					// ###AJAXTOKE### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single);
 
-                                        if (isset($this->customScriptBuilder['php_document'][$viewName_single]) 
+					if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
 					{
 						// ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
 						$this->customScriptBuilder['php_document'][$viewName_single] = str_replace('$document->', '$this->document->', $this->customScriptBuilder['php_document'][$viewName_single]);
-                                                $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
+						$this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = PHP_EOL . $this->setPlaceholders(
-                                                        = PHP_EOL.$this->setPlaceholders(
+								$this->customScriptBuilder['php_document'][$viewName_single], $this->placeholders);
-								$this->customScriptBuilder['php_document'][$viewName_single], 
-								$this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['php_document'][$viewName_single]);
 					}
@@ -335,8 +328,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = '';
 
 					// ###VALIDATEFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] 
+					$this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
-						= $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
 
 					// ###EDITBODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
@@ -360,20 +352,16 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
 
 					// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
 
 					// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL . PHP_EOL);
-						= $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);
 
 					// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
 
 					// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL . PHP_EOL);
-						= $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);
 
 					// ###CHECKBOX_SAVE### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@@ -382,16 +370,12 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
 
 					// ###POSTSAVEHOOK### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] 
+					$this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, PHP_EOL . "\t\treturn;", PHP_EOL . PHP_EOL . "\t\treturn;");
-						= $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, 
-							PHP_EOL."\t\treturn;", PHP_EOL.PHP_EOL."\t\treturn;");
 
-                                        if (isset($this->customScriptBuilder['css_view'][$viewName_single]) 
+					if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
 					{
 						// ###VIEWCSS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
+						$this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
-                                                        = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['css_view'][$viewName_single]);
 					}
@@ -403,8 +387,7 @@ class Infusion extends Interpretation
 					// add css to front end
 					if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
 					{
-                                                $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] 
+						$this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
-							= $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
 					}
 				}
 				// set the views names
@@ -412,12 +395,12 @@ class Infusion extends Interpretation
 				{
 					$this->lang = 'admin';
 					// ###VIEWS### <<<DYNAMIC>>>
-                                        $viewsName_u = ComponentbuilderHelper::safeString($view['settings']->name_list,'U');
+					$viewsName_u = ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
 					$this->fileContentDynamic[$viewName_list]['###VIEWS###'] = $viewsName_u;
 					$this->fileContentDynamic[$viewName_single]['###VIEWS###'] = $viewsName_u;
 
 					// ###Views### <<<DYNAMIC>>>
-                                        $viewsName_f = ComponentbuilderHelper::safeString($view['settings']->name_list,'F');
+					$viewsName_f = ComponentbuilderHelper::safeString($view['settings']->name_list, 'F');
 					$this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f;
 					$this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f;
 
@@ -455,11 +438,9 @@ class Infusion extends Interpretation
 					if (isset($view['checkin']) && $view['checkin'] == 1)
 					{
 						// ###AUTOCHECKIN### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###']
+						$this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single, $this->fileContentStatic['###component###']);
-							= $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']);
 						// ###CHECKINCALL### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###']
+						$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall();
-							= $this->setCheckinCall();
 					}
 					else
 					{
@@ -469,26 +450,20 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = '';
 					}
 					// ###ADMIN_CUSTOM_BUTTONS_LIST###
-                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###']
+					$this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###'] = $this->setCustomButtons($view, 3, "\t");
-						= $this->setCustomButtons($view, 3, "\t");
+					$this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST###'] = $this->setFunctionOnlyButtons($viewName_list);
-                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST###'] 
-						= $this->setFunctionOnlyButtons($viewName_list);
 
 					// ###GET_ITEMS_METHOD_STRING_FIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###']
+					$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single, $this->fileContentStatic['###Component###']);
-						= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
 
 					// ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###']
+					$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
 
 					// ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###']
+					$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list, $this->fileContentStatic['###Component###']);
-						= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
 
 					// ###SELECTIONTRANSLATIONFIXFUNC### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###']
+					$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list, $this->fileContentStatic['###Component###']);
-						= $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']);
 
 					// ###FILTER_FIELDS### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list);
@@ -510,54 +485,45 @@ class Infusion extends Interpretation
 					{
 						$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = '';
 					}
-                                        $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] 
+					$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single, $viewName_list);
-						.= $this->setRouterCategoryViews($viewName_single,$viewName_list);
 
 					// ###OTHERFILTERS### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list);
 
 					// ###FILTERFUNCTIONS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] 
+					$this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single, $viewName_list);
-						= $this->setFilterFunctions($viewName_single,$viewName_list);
 
 					// ###LISTQUERY### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single,$viewName_list);
+					$this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single, $viewName_list);
 
 					// ###MODELEXPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] 
+					$this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list);
-						= $this->setModelExportMethod($viewName_single, $viewName_list);
 
 					// ###MODELEXIMPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] 
+					$this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list);
-						= $this->setControllerEximportMethod($viewName_single, $viewName_list);
 
 					// ###EXPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] 
+					$this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list);
-						= $this->setExportButton($viewName_single, $viewName_list);
 
 					// ###IMPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] 
+					$this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list);
-						= $this->setImportButton($viewName_single, $viewName_list);
 
 					// ###LISTHEAD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single,$viewName_list);
+					$this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single, $viewName_list);
 
 					// ###LISTBODY### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###LISTBODY###'] = $this->setListBody($viewName_single,$viewName_list);
+					$this->fileContentDynamic[$viewName_list]['###LISTBODY###'] = $this->setListBody($viewName_single, $viewName_list);
 
 					// ###LISTCOLNR### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list);
 
 					// ###JVIEWLISTCANDO### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] 
+					$this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single, $viewName_list);
-						= $this->setJviewListCanDo($viewName_single,$viewName_list);
 
-                                        if (isset($this->customScriptBuilder['css_views'][$viewName_list]) 
+					if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
 					{
 						// ###VIEWCSS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
+						$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
-                                                        = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['css_views'][$viewName_list]);
 					}
@@ -585,38 +551,29 @@ class Infusion extends Interpretation
 
 				// ###BATCH_ONCLICK_CANCEL_SCRIPT### <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build
-
 				// ###JCONTROLLERFORM_ALLOWADD### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] 
+				$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single, $viewName_list);
-					= $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);
 
 				// ###JCONTROLLERFORM_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] 
+				$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
-					= $this->setJcontrollerAllowEdit($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_GETFORM### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single, $viewName_list);
-					= $this->setJmodelAdminGetForm($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single, $viewName_list);
-					= $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_CANDELETE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single, $viewName_list);
-					= $this->setJmodelAdminCanDelete($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_CANEDITSTATE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single, $viewName_list);
-					= $this->setJmodelAdminCanEditState($viewName_single,$viewName_list);
 
 				// set custom admin view Toolbare buttons
 				// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] 
+				$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list);
-					= $this->setCustomAdminDynamicButton($viewName_list);
 				// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] 
+				$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list);
-					= $this->setCustomAdminDynamicButtonController($viewName_list);
 
 				// set helper router
 				if (!isset($this->fileContentStatic['###ROUTEHELPER###']))
@@ -641,7 +598,6 @@ class Infusion extends Interpretation
 
 				// ###HELPER_EXEL###
 				$this->fileContentStatic['###HELPER_EXEL###'] = $this->setExelHelperMethods();
-
 			}
 
 			// setup custom_admin_views and all needed stuff for the site
@@ -662,14 +618,13 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$view['settings']->code]['###sviews###'] = $view['settings']->code;
 					$this->fileContentDynamic[$view['settings']->code]['###SVIEWS###'] = $view['settings']->CODE;
 					// add to lang array
-                                        if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE]))
+					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE]))
 					{
-                                                $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name;
+						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
 					}
-                                        if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
+					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
 					{
-                                                $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-							= $view['settings']->description;
 					}
 					// ###ICOMOON### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon'];
@@ -694,14 +649,12 @@ class Infusion extends Interpretation
 					if ($view['settings']->main_get->gettype == 1)
 					{
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code], $this->placeholders);
-                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-                                                        unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]);
 						}
 						else
 						{
@@ -710,18 +663,15 @@ class Infusion extends Interpretation
 						}
 
 						// ###CUSTOM_ADMIN_GET_ITEM### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code, "\t\t");
-							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code], $this->placeholders);
-                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-                                                        unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]);
 						}
 						else
 						{
@@ -732,18 +682,15 @@ class Infusion extends Interpretation
 					elseif ($view['settings']->main_get->gettype == 2)
 					{
 						// ###CUSTOM_ADMIN_GET_LIST_QUERY### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code], $this->placeholders);
-                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-                                                        unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code]);
 						}
 						else
 						{
@@ -752,14 +699,12 @@ class Infusion extends Interpretation
 						}
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code], $this->placeholders);
-                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-                                                        unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]);
 						}
 						else
 						{
@@ -768,18 +713,15 @@ class Infusion extends Interpretation
 						}
 
 						// ###CUSTOM_ADMIN_GET_ITEMS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code], $this->placeholders);
-                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-                                                        unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]);
 						}
 						else
 						{
@@ -789,25 +731,20 @@ class Infusion extends Interpretation
 					}
 
 					// ###CUSTOM_ADMIN_CUSTOM_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
-						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
 					// ###CUSTOM_ADMIN_DIPLAY_METHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
-						= $this->setCustomViewDisplayMethod($view);
 					// set document details
 					$this->setPrepareDocument($view);
 					// ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
-						= $this->setCustomViewExtraDisplayMethods($view);
 					// ###CUSTOM_ADMIN_CODE_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 					// ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
 					// ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view);
-						= $this->setCustomViewSubmitButtonScript($view);
 
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
@@ -818,10 +755,10 @@ class Infusion extends Interpretation
 			}
 
 			// ###VIEWARRAY###
-                        $this->fileContentStatic['###VIEWARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$viewarray);
+			$this->fileContentStatic['###VIEWARRAY###'] = PHP_EOL . implode("," . PHP_EOL, $viewarray);
 
 			// ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY###
-                        $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$site_edit_view_array);
+			$this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = PHP_EOL . implode("," . PHP_EOL, $site_edit_view_array);
 
 			// ###MAINMENUS###
 			$this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus();
@@ -867,7 +804,7 @@ class Infusion extends Interpretation
 			{
 				// setup import files
 				$target = array('admin' => 'import');
-                                $this->buildDynamique($target,'import');
+				$this->buildDynamique($target, 'import');
 				// set the controller
 				$this->fileContentDynamic['import']['###BLABLABLA###'] = '';
 			}
@@ -877,7 +814,7 @@ class Infusion extends Interpretation
 			{
 				// setup Ajax files
 				$target = array('admin' => 'ajax');
-                                $this->buildDynamique($target,'ajax');
+				$this->buildDynamique($target, 'ajax');
 				// set the controller
 				$this->fileContentDynamic['ajax']['###REGISTER_AJAX_TASK###'] = $this->setRegisterAjaxTask('admin');
 				$this->fileContentDynamic['ajax']['###AJAX_INPUT_RETURN###'] = $this->setAjaxInputReturn('admin');
@@ -890,10 +827,10 @@ class Infusion extends Interpretation
 			{
 				// setup Ajax files
 				$target = array('site' => 'ajax');
-                                $this->buildDynamique($target,'ajax');
+				$this->buildDynamique($target, 'ajax');
 				// set the controller
-                                $this->fileContentDynamic['ajax']['###REGISTER_SITE_AJAX_TASK###'] = $this->setRegisterAjaxTask('site' );
+				$this->fileContentDynamic['ajax']['###REGISTER_SITE_AJAX_TASK###'] = $this->setRegisterAjaxTask('site');
-                                $this->fileContentDynamic['ajax']['###AJAX_SITE_INPUT_RETURN###'] = $this->setAjaxInputReturn('site' );
+				$this->fileContentDynamic['ajax']['###AJAX_SITE_INPUT_RETURN###'] = $this->setAjaxInputReturn('site');
 				// set the module
 				$this->fileContentDynamic['ajax']['###AJAX_SITE_MODEL_METHODS###'] = $this->setAjaxModelMethods('site');
 			}
@@ -912,7 +849,6 @@ class Infusion extends Interpretation
 						}
 					}
 				}
-
 			}
 
 			// ###CONFIG_FIELDSETS###
@@ -967,8 +903,7 @@ class Infusion extends Interpretation
 					}
 
 					// insure the needed route helper is loaded
-					$this->fileContentStatic['###ROUTEHELPER###'] 
+					$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code, $view['settings']->code, true);
-						.= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
 					// build route details 
 					$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code, $view);
 					$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
@@ -976,17 +911,14 @@ class Infusion extends Interpretation
 					if ($view['settings']->main_get->gettype == 1)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 1);
-							= $this->setUserPermissionCheckAccess($view, 1);
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code], $this->placeholders);
-								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-							unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]);
 						}
 						else
 						{
@@ -995,18 +927,15 @@ class Infusion extends Interpretation
 						}
 
 						// ###SITE_GET_ITEM### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code, "\t\t");
-							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code], $this->placeholders);
-								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-							unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]);
 						}
 						else
 						{
@@ -1017,21 +946,17 @@ class Infusion extends Interpretation
 					elseif ($view['settings']->main_get->gettype == 2)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 2);
-							= $this->setUserPermissionCheckAccess($view, 2);					
 						// ###SITE_GET_LIST_QUERY### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code], $this->placeholders);
-								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-							unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]);
 						}
 						else
 						{
@@ -1040,18 +965,15 @@ class Infusion extends Interpretation
 						}
 
 						// ###SITE_GET_ITEMS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code], $this->placeholders);
-								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
-							unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+							unset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]);
 						}
 						else
 						{
@@ -1060,28 +982,23 @@ class Infusion extends Interpretation
 						}
 					}
 					// add to lang array
-					if (!isset($this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE]))
+					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE]))
 					{
-						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name;
+						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
 					}
-					if (!isset($this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
+					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
 					{
-						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-							= $view['settings']->description;
 					}
 					// ###SITE_CUSTOM_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
-						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
 					// ###SITE_DIPLAY_METHOD### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
-						= $this->setCustomViewDisplayMethod($view);
 					// set document details
 					$this->setPrepareDocument($view);
 					// ###SITE_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
-						= $this->setCustomViewExtraDisplayMethods($view);
 					// ###SITE_CODE_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###SITE_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 					// ###SITE_BODY### <<<DYNAMIC>>>
@@ -1097,8 +1014,7 @@ class Infusion extends Interpretation
 				}
 				// set site custom script to helper class
 				// ###SITE_CUSTOM_HELPER_SCRIPT###
-				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] 
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
-					= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
 				// ###SITE_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
 				// ###SITE_GLOBAL_EVENT###
@@ -1106,19 +1022,16 @@ class Infusion extends Interpretation
 				// now load the data for the global event if needed
 				if ($this->componentData->add_site_event == 1)
 				{
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Site Event';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL . PHP_EOL . '// Triger the Global Site Event';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= PHP_EOL . $this->fileContentStatic['###Component###'] . 'Helper::globalEvent($document);';
-						.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 					// ###SITE_GLOBAL_EVENT_HELPER###
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL . PHP_EOL . "\t" . '/**';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Site Event Method.';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '*	The Global Site Event Method.';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '**/';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . 'public static function globalEvent($document)';
-						.= PHP_EOL."\t".'public static function globalEvent($document)';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . $this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '}';
-						.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 				}
 				// setup the layouts
 				$this->setCustomViewLayouts();
@@ -1148,17 +1061,16 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###HELPER_UIKIT###'] = $this->setUikitHelperMethods();
 
 			// ###CONFIG_FIELDSETS###
-			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL,$this->configFieldSets);
+			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL, $this->configFieldSets);
 
 			// check if this has been set
-			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) 
+			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
-				|| !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
 			{
 				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = 0;
 			}
 			else
 			{
-				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '('.$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'].')';
+				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '(' . $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] . ')';
 			}
 
 			// ###README###
@@ -1260,7 +1172,7 @@ class Infusion extends Interpretation
 						$t = '.sys';
 					}
 					// build the path to to place the lang file
-					$path = $this->componentPath.'/'.$p.'/language/'.$tag;
+					$path = $this->componentPath . '/' . $p . '/language/' . $tag;
 					if (!JFolder::exists($path))
 					{
 						JFolder::create($path);
@@ -1270,17 +1182,17 @@ class Infusion extends Interpretation
 					// build the file name
 					$fileName = $tag . '.com_' . $this->componentCodeName . $t . '.ini';
 					// move the file to its place
-					JFile::copy($getPAth, $path.'/'.$fileName);
+					JFile::copy($getPAth, $path . '/' . $fileName);
 					// count the file created
 					$this->fileCount++;
 					// add content to it
 					$lang = '';
 					foreach ($languageStrings as $place => $string)
 					{
-						$lang .= $place.'="'.$string.'"'.PHP_EOL;
+						$lang .= $place . '="' . $string . '"' . PHP_EOL;
 					}
 					// add to language file
-					$this->writeFile($path.'/'.$fileName, $lang);
+					$this->writeFile($path . '/' . $fileName, $lang);
 					// set the line counter
 					$this->lineCount = $this->lineCount + substr_count($lang, PHP_EOL);
 					// build xml strings
@@ -1288,7 +1200,7 @@ class Infusion extends Interpretation
 					{
 						$langXML[$p] = array();
 					}
-					$langXML[$p][] = '<language tag="'.$tag.'">language/'.$tag.'/'.$fileName.'</language>';
+					$langXML[$p][] = '<language tag="' . $tag . '">language/' . $tag . '/' . $fileName . '</language>';
 				}
 			}
 			// load the lang xml 
@@ -1297,21 +1209,22 @@ class Infusion extends Interpretation
 				$replace = array();
 				if (isset($langXML['admin']) && ComponentbuilderHelper::checkArray($langXML['admin']))
 				{
-					$replace['###ADMIN_LANGUAGES###'] = implode(PHP_EOL."\t\t\t", $langXML['admin']);
+					$replace['###ADMIN_LANGUAGES###'] = implode(PHP_EOL . "\t\t\t", $langXML['admin']);
 				}
 				if (!$this->removeSiteFolder && isset($langXML['site']) && ComponentbuilderHelper::checkArray($langXML['site']))
 				{
-					$replace['###SITE_LANGUAGES###'] = implode(PHP_EOL."\t\t", $langXML['site']);
+					$replace['###SITE_LANGUAGES###'] = implode(PHP_EOL . "\t\t", $langXML['site']);
 				}
 				// build xml path
-				$xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml';
+				$xmlPath = $this->componentPath . '/' . $this->fileContentStatic['###component###'] . '.xml';
 				// get the content in xml
 				$componentXML = ComponentbuilderHelper::getFileContents($xmlPath);
 				// update the xml content
 				$componentXML = $this->setPlaceholders($componentXML, $replace);
 				// store the values back to xml
-				$this->writeFile($xmlPath,$componentXML);
+				$this->writeFile($xmlPath, $componentXML);
 			}
 		}
 	}
+
 }

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

@@ -2460,6 +2460,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL="Add CSS (custom d
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE="Add Javascript File"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript to the JavaScript file linked to this view."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT="Add Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
@@ -2551,7 +2554,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET="Custom Get"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL="Custom Gets"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DATABASE="Database"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT="Default"
@@ -2624,6 +2626,11 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO="Info"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE="Javascript File"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."
@@ -2693,6 +2700,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PENCIL_TWO="Pencil 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE_TWO="Phone 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
@@ -5209,6 +5217,9 @@ COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL="Add CSS (custom document
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button"
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE="Add Javascript File"
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript to the JavaScript file linked to this view."
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT="Add Js Document"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX="Add Php Ajax"
@@ -5394,6 +5405,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_INPUT_FILTER_DESCRIPTION="Select the filter used
 COM_COMPONENTBUILDER_SITE_VIEW_INPUT_FILTER_LABEL="Select a Filter"
 COM_COMPONENTBUILDER_SITE_VIEW_INT="INT"
 COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE="Javascript File"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
 COM_COMPONENTBUILDER_SITE_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."

admin/layouts/custom_admin_view/javascript_css_fullwidth.php

@@ -0,0 +1,55 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		javascript_css_fullwidth.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'add_js_document',
+	'js_document',
+	'add_javascript_file',
+	'javascript_file',
+	'add_css_document',
+	'css_document',
+	'add_css',
+	'css'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>

admin/layouts/custom_admin_view/php_fullwidth.php

@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		custom_script_fullwidth.php
+	@subpackage		php_fullwidth.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved
@@ -37,13 +37,7 @@ $fields = $displayData->get('fields') ?: array(
 	'add_php_jview_display',
 	'php_jview_display',
 	'add_php_jview',
-	'php_jview',
+	'php_jview'
-	'add_js_document',
-	'js_document',
-	'add_css_document',
-	'css_document',
-	'add_css',
-	'css'
 );
 
 ?>

admin/layouts/fieldtype/fields_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vzwfields;
+$items	= $displayData->vzyfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/ftp/linked_components_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vzxlinked_components;
+$items	= $displayData->vzzlinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

admin/layouts/site_view/javascript_css_fullwidth.php

@@ -30,6 +30,8 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
+	'add_javascript_file',
+	'javascript_file',
 	'add_js_document',
 	'js_document',
 	'add_css_document',

admin/models/custom_admin_view.php

@@ -103,14 +103,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
-			if (!empty($item->custom_button))
-			{
-				// Convert the custom_button field to an array.
-				$custom_button = new Registry;
-				$custom_button->loadString($item->custom_button);
-				$item->custom_button = $custom_button->toArray();
-			}
-
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -119,6 +111,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_get = $custom_get->toArray();
 			}
 
+			if (!empty($item->custom_button))
+			{
+				// Convert the custom_button field to an array.
+				$custom_button = new Registry;
+				$custom_button->loadString($item->custom_button);
+				$item->custom_button = $custom_button->toArray();
+			}
+
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
@@ -137,6 +137,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_model = base64_decode($item->php_model);
 			}
 
+			if (!empty($item->js_document))
+			{
+				// base64 Decode js_document.
+				$item->js_document = base64_decode($item->js_document);
+			}
+
+			if (!empty($item->javascript_file))
+			{
+				// base64 Decode javascript_file.
+				$item->javascript_file = base64_decode($item->javascript_file);
+			}
+
+			if (!empty($item->css_document))
+			{
+				// base64 Decode css_document.
+				$item->css_document = base64_decode($item->css_document);
+			}
+
+			if (!empty($item->css))
+			{
+				// base64 Decode css.
+				$item->css = base64_decode($item->css);
+			}
+
 			if (!empty($item->php_document))
 			{
 				// base64 Decode php_document.
@@ -161,24 +185,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_jview = base64_decode($item->php_jview);
 			}
 
-			if (!empty($item->js_document))
-			{
-				// base64 Decode js_document.
-				$item->js_document = base64_decode($item->js_document);
-			}
-
-			if (!empty($item->css_document))
-			{
-				// base64 Decode css_document.
-				$item->css_document = base64_decode($item->css_document);
-			}
-
-			if (!empty($item->css))
-			{
-				// base64 Decode css.
-				$item->css = base64_decode($item->css);
-			}
-
 			// check what type of custom_button array we have here (should be subform... but just incase)
 			// This could happen due to huge data sets
 			if (isset($item->custom_button) && isset($item->custom_button['name']))
@@ -939,19 +945,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
-		// Set the custom_button items to data.
-		if (isset($data['custom_button']) && is_array($data['custom_button']))
-		{
-			$custom_button = new JRegistry;
-			$custom_button->loadArray($data['custom_button']);
-			$data['custom_button'] = (string) $custom_button;
-		}
-		elseif (!isset($data['custom_button']))
-		{
-			// Set the empty custom_button to data
-			$data['custom_button'] = '';
-		}
-
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@@ -965,6 +958,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_get'] = '';
 		}
 
+		// Set the custom_button items to data.
+		if (isset($data['custom_button']) && is_array($data['custom_button']))
+		{
+			$custom_button = new JRegistry;
+			$custom_button->loadArray($data['custom_button']);
+			$data['custom_button'] = (string) $custom_button;
+		}
+		elseif (!isset($data['custom_button']))
+		{
+			// Set the empty custom_button to data
+			$data['custom_button'] = '';
+		}
+
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
@@ -983,6 +989,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
+		// Set the js_document string to base64 string.
+		if (isset($data['js_document']))
+		{
+			$data['js_document'] = base64_encode($data['js_document']);
+		}
+
+		// Set the javascript_file string to base64 string.
+		if (isset($data['javascript_file']))
+		{
+			$data['javascript_file'] = base64_encode($data['javascript_file']);
+		}
+
+		// Set the css_document string to base64 string.
+		if (isset($data['css_document']))
+		{
+			$data['css_document'] = base64_encode($data['css_document']);
+		}
+
+		// Set the css string to base64 string.
+		if (isset($data['css']))
+		{
+			$data['css'] = base64_encode($data['css']);
+		}
+
 		// Set the php_document string to base64 string.
 		if (isset($data['php_document']))
 		{
@@ -1007,24 +1037,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_jview'] = base64_encode($data['php_jview']);
 		}
         
-		// Set the js_document string to base64 string.
-		if (isset($data['js_document']))
-		{
-			$data['js_document'] = base64_encode($data['js_document']);
-		}
-
-		// Set the css_document string to base64 string.
-		if (isset($data['css_document']))
-		{
-			$data['css_document'] = base64_encode($data['css_document']);
-		}
-
-		// Set the css string to base64 string.
-		if (isset($data['css']))
-		{
-			$data['css'] = base64_encode($data['css']);
-		}
-        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/custom_admin_views.php

@@ -272,6 +272,14 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 						$item->default = base64_decode($item->default);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode js_document
+						$item->js_document = base64_decode($item->js_document);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
+						// decode css_document
+						$item->css_document = base64_decode($item->css_document);
+						// decode css
+						$item->css = base64_decode($item->css);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_view
@@ -280,12 +288,6 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_jview
 						$item->php_jview = base64_decode($item->php_jview);
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
-						// decode css_document
-						$item->css_document = base64_decode($item->css_document);
-						// decode css
-						$item->css = base64_decode($item->css);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fieldtype.php

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

admin/models/forms/custom_admin_view.js

@@ -30,8 +30,9 @@ jform_vvvvvydvxy_required = false;
 jform_vvvvvyevxz_required = false;
 jform_vvvvvyfvya_required = false;
 jform_vvvvvygvyb_required = false;
-jform_vvvvvygvyc_required = false;
+jform_vvvvvyhvyc_required = false;
 jform_vvvvvyhvyd_required = false;
+jform_vvvvvyivye_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -51,14 +52,17 @@ jQuery(document).ready(function()
 	var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val();
 	vvvvvye(add_css_document_vvvvvye);
 
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyf(add_javascript_file_vvvvvyf);
 
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyg(add_js_document_vvvvvyg);
 
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyh(add_custom_button_vvvvvyh);
+
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyi(add_css_vvvvvyi);
 });
 
 // the vvvvvya function
@@ -217,61 +221,92 @@ function vvvvvye(add_css_document_vvvvvye)
 }
 
 // the vvvvvyf function
-function vvvvvyf(add_js_document_vvvvvyf)
+function vvvvvyf(add_javascript_file_vvvvvyf)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyf == 1)
+	if (add_javascript_file_vvvvvyf == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyfvya_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyfvya_required = true;
 		}
 	}
 }
 
 // the vvvvvyg function
-function vvvvvyg(add_custom_button_vvvvvyg)
+function vvvvvyg(add_js_document_vvvvvyg)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyg == 1)
+	if (add_js_document_vvvvvyg == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvygvyb_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_vvvvvygvyb_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvygvyb_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_vvvvvygvyb_required = true;
+		}
+	}
+}
+
+// the vvvvvyh function
+function vvvvvyh(add_custom_button_vvvvvyh)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyh == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvygvyb_required)
+		if (jform_vvvvvyhvyc_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_vvvvvygvyb_required = false;
+			jform_vvvvvyhvyc_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvygvyc_required)
+		if (jform_vvvvvyhvyd_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_vvvvvygvyc_required = false;
+			jform_vvvvvyhvyd_required = false;
 		}
 
 	}
@@ -279,53 +314,53 @@ function vvvvvyg(add_custom_button_vvvvvyg)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvygvyb_required)
+		if (!jform_vvvvvyhvyc_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_vvvvvygvyb_required = true;
+			jform_vvvvvyhvyc_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvygvyc_required)
+		if (!jform_vvvvvyhvyd_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_vvvvvygvyc_required = true;
+			jform_vvvvvyhvyd_required = true;
 		}
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyi function
-function vvvvvyh(add_css_vvvvvyh)
+function vvvvvyi(add_css_vvvvvyi)
 {
 	// set the function logic
-	if (add_css_vvvvvyh == 1)
+	if (add_css_vvvvvyi == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyhvyd_required)
+		if (jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyhvyd_required = false;
+			jform_vvvvvyivye_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyd_required)
+		if (!jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyhvyd_required = true;
+			jform_vvvvvyivye_required = true;
 		}
 	}
 }

admin/models/forms/custom_admin_view.xml

@@ -138,30 +138,10 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_language_string"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
-                       heading="h4"
-                       class="note_add_language_string" />
-                <!-- Icon Field. Type: Media. (joomla)-->
-                <field type="media"
-                       name="icon"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
-                       directory="" />
-                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_jview"
+                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -169,10 +149,16 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
+                <!-- Icon Field. Type: Media. (joomla)-->
+                <field type="media"
+                       name="icon"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
+                       directory="" />
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css_document"
+                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -191,6 +177,31 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
+                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_add_language_string"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
+                       heading="h4"
+                       class="note_add_language_string" />
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_libraries_selection"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_libraries_selection" />
                 <!-- Libraries Field. Type: Libraries. (custom)-->
                 <field type="libraries"
                        name="libraries"
@@ -201,10 +212,27 @@
                        default="0"
                        required="false"
                        button="true" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <!-- Add_css Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_jview_display"
+                       name="add_css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -223,27 +251,10 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
                        required="false" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_js_document"
+                       name="add_php_jview"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -257,6 +268,159 @@
                        label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL"
                        heading="h4"
                        class="snippet-usage note_snippet_usage" />
+                <!-- Default Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="default"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
+                       required="true" />
+                <!-- Php_model Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_model"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
+                       required="false" />
+                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_javascript_file"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Js_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="js_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="javascript_file"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT"
+                       required="true" />
+                <!-- Custom_get Field. Type: Customgets. (custom)-->
+                <field type="customgets"
+                       name="custom_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
+                       multiple="true" />
+                <!-- Css_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Main_get Field. Type: Maingets. (custom)-->
+                <field type="maingets"
+                       name="main_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
+                       multiple="false"
+                       required="true"
+                       button="true" />
+                <!-- Css Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
+                       required="true" />
+                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
+                <field type="dynamicgets"
+                       name="dynamic_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+                       multiple="false"
+                       required="false" />
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="dynamic_values"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
+                       heading="h4"
+                       class="dynamic_values" />
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
+                       required="true" />
+                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_button"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
                 <!-- Custom_button Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="custom_button"
@@ -544,89 +708,6 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Default Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="default"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
-                       rows="20"
-                       cols="15"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
-                       required="true" />
-                <!-- Php_model Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_model"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
-                       required="false" />
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
-                       required="true" />
-                <!-- Custom_get Field. Type: Customgets. (custom)-->
-                <field type="customgets"
-                       name="custom_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
-                       multiple="true" />
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
-                <!-- Main_get Field. Type: Maingets. (custom)-->
-                <field type="maingets"
-                       name="main_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
-                       multiple="false"
-                       required="true"
-                       button="true" />
                 <!-- Php_jview Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview"
@@ -638,64 +719,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
                        required="true" />
-                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
-                <field type="dynamicgets"
-                       name="dynamic_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
-                       multiple="false"
-                       required="false" />
-                <!-- Js_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="js_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="dynamic_values"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
-                       heading="h4"
-                       class="dynamic_values" />
-                <!-- Css_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_custom_button"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Css Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
-                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/custom_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzqvzi_required = false;
+jform_vvvvvzsvzk_required = false;
-jform_vvvvvzrvzj_required = false;
+jform_vvvvvztvzl_required = false;
-jform_vvvvvzrvzk_required = false;
+jform_vvvvvztvzm_required = false;
-jform_vvvvvzrvzl_required = false;
+jform_vvvvvztvzn_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
 
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
+
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
 });
 
-// the vvvvvzq function
+// the vvvvvzs function
-function vvvvvzq(target_vvvvvzq)
+function vvvvvzs(target_vvvvvzs)
 {
 	// set the function logic
-	if (target_vvvvvzq == 2)
+	if (target_vvvvvzs == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzqvzi_required)
+		if (jform_vvvvvzsvzk_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_vvvvvzqvzi_required = false;
+			jform_vvvvvzsvzk_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzq(target_vvvvvzq)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzqvzi_required)
+		if (!jform_vvvvvzsvzk_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_vvvvvzqvzi_required = true;
+			jform_vvvvvzsvzk_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzr function
+// the vvvvvzt function
-function vvvvvzr(target_vvvvvzr)
+function vvvvvzt(target_vvvvvzt)
 {
 	// set the function logic
-	if (target_vvvvvzr == 1)
+	if (target_vvvvvzt == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzrvzj_required)
+		if (jform_vvvvvztvzl_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzrvzj_required = false;
+			jform_vvvvvztvzl_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzrvzk_required)
+		if (jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzrvzk_required = false;
+			jform_vvvvvztvzm_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzrvzl_required)
+		if (jform_vvvvvztvzn_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzrvzl_required = false;
+			jform_vvvvvztvzn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzj_required)
+		if (!jform_vvvvvztvzl_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzrvzj_required = true;
+			jform_vvvvvztvzl_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzk_required)
+		if (!jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzrvzk_required = true;
+			jform_vvvvvztvzm_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzl_required)
+		if (!jform_vvvvvztvzn_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzrvzl_required = true;
+			jform_vvvvvztvzn_required = true;
 		}
 	}
 }
 
-// the vvvvvzs function
+// the vvvvvzu function
-function vvvvvzs(target_vvvvvzs,type_vvvvvzs)
+function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
 {
 	// set the function logic
-	if (target_vvvvvzs == 1 && type_vvvvvzs == 1)
+	if (target_vvvvvzu == 1 && type_vvvvvzu == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzs(target_vvvvvzs,type_vvvvvzs)
 	}
 }
 
-// the vvvvvzt function
+// the vvvvvzv function
-function vvvvvzt(type_vvvvvzt,target_vvvvvzt)
+function vvvvvzv(type_vvvvvzv,target_vvvvvzv)
 {
 	// set the function logic
-	if (type_vvvvvzt == 1 && target_vvvvvzt == 1)
+	if (type_vvvvvzv == 1 && target_vvvvvzv == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -23,210 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwacvzo_required = false;
-jform_vvvvwadvzp_required = false;
 jform_vvvvwaevzq_required = false;
 jform_vvvvwafvzr_required = false;
-jform_vvvvwaivzs_required = false;
+jform_vvvvwagvzs_required = false;
-jform_vvvvwajvzt_required = false;
+jform_vvvvwahvzt_required = false;
 jform_vvvvwakvzu_required = false;
 jform_vvvvwalvzv_required = false;
+jform_vvvvwamvzw_required = false;
+jform_vvvvwanvzx_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
 
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwah(datatype_vvvvwah);
 
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var store_vvvvwai = jQuery("#jform_store").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
 
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwak(add_css_view_vvvvwak);
 
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwal(add_css_views_vvvvwal);
+
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwam(add_javascript_view_footer_vvvvwam);
+
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 });
 
-// the vvvvwac function
+// the vvvvwae function
-function vvvvwac(datalenght_vvvvwac)
+function vvvvwae(datalenght_vvvvwae)
 {
-	if (isSet(datalenght_vvvvwac) && datalenght_vvvvwac.constructor !== Array)
+	if (isSet(datalenght_vvvvwae) && datalenght_vvvvwae.constructor !== Array)
 	{
-		var temp_vvvvwac = datalenght_vvvvwac;
+		var temp_vvvvwae = datalenght_vvvvwae;
-		var datalenght_vvvvwac = [];
+		var datalenght_vvvvwae = [];
-		datalenght_vvvvwac.push(temp_vvvvwac);
+		datalenght_vvvvwae.push(temp_vvvvwae);
 	}
-	else if (!isSet(datalenght_vvvvwac))
+	else if (!isSet(datalenght_vvvvwae))
 	{
-		var datalenght_vvvvwac = [];
+		var datalenght_vvvvwae = [];
 	}
-	var datalenght = datalenght_vvvvwac.some(datalenght_vvvvwac_SomeFunc);
+	var datalenght = datalenght_vvvvwae.some(datalenght_vvvvwae_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwacvzo_required)
+		if (jform_vvvvwaevzq_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_vvvvwacvzo_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwacvzo_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_vvvvwacvzo_required = true;
-		}
-	}
-}
-
-// the vvvvwac Some function
-function datalenght_vvvvwac_SomeFunc(datalenght_vvvvwac)
-{
-	// set the function logic
-	if (datalenght_vvvvwac == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwad function
-function vvvvwad(datadefault_vvvvwad)
-{
-	if (isSet(datadefault_vvvvwad) && datadefault_vvvvwad.constructor !== Array)
-	{
-		var temp_vvvvwad = datadefault_vvvvwad;
-		var datadefault_vvvvwad = [];
-		datadefault_vvvvwad.push(temp_vvvvwad);
-	}
-	else if (!isSet(datadefault_vvvvwad))
-	{
-		var datadefault_vvvvwad = [];
-	}
-	var datadefault = datadefault_vvvvwad.some(datadefault_vvvvwad_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwadvzp_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_vvvvwadvzp_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwadvzp_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_vvvvwadvzp_required = true;
-		}
-	}
-}
-
-// the vvvvwad Some function
-function datadefault_vvvvwad_SomeFunc(datadefault_vvvvwad)
-{
-	// set the function logic
-	if (datadefault_vvvvwad == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwae function
-function vvvvwae(datatype_vvvvwae)
-{
-	if (isSet(datatype_vvvvwae) && datatype_vvvvwae.constructor !== Array)
-	{
-		var temp_vvvvwae = datatype_vvvvwae;
-		var datatype_vvvvwae = [];
-		datatype_vvvvwae.push(temp_vvvvwae);
-	}
-	else if (!isSet(datatype_vvvvwae))
-	{
-		var datatype_vvvvwae = [];
-	}
-	var datatype = datatype_vvvvwae.some(datatype_vvvvwae_SomeFunc);
-
-
-	// set this function logic
-	if (datatype)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwaevzq_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwaevzq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwaevzq_required)
 		{
-			updateFieldRequired('indexes',1);
+			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			jQuery('#jform_datalenght_other').removeClass('required');
 			jform_vvvvwaevzq_required = true;
 		}
 	}
 }
 
 // the vvvvwae Some function
-function datatype_vvvvwae_SomeFunc(datatype_vvvvwae)
+function datalenght_vvvvwae_SomeFunc(datalenght_vvvvwae)
 {
 	// set the function logic
-	if (datatype_vvvvwae == 'CHAR' || datatype_vvvvwae == 'VARCHAR' || datatype_vvvvwae == 'DATETIME' || datatype_vvvvwae == 'DATE' || datatype_vvvvwae == 'TIME' || datatype_vvvvwae == 'INT' || datatype_vvvvwae == 'TINYINT' || datatype_vvvvwae == 'BIGINT' || datatype_vvvvwae == 'FLOAT' || datatype_vvvvwae == 'DECIMAL' || datatype_vvvvwae == 'DOUBLE')
+	if (datalenght_vvvvwae == 'Other')
 	{
 		return true;
 	}
@@ -234,54 +120,54 @@ function datatype_vvvvwae_SomeFunc(datatype_vvvvwae)
 }
 
 // the vvvvwaf function
-function vvvvwaf(datatype_vvvvwaf)
+function vvvvwaf(datadefault_vvvvwaf)
 {
-	if (isSet(datatype_vvvvwaf) && datatype_vvvvwaf.constructor !== Array)
+	if (isSet(datadefault_vvvvwaf) && datadefault_vvvvwaf.constructor !== Array)
 	{
-		var temp_vvvvwaf = datatype_vvvvwaf;
+		var temp_vvvvwaf = datadefault_vvvvwaf;
-		var datatype_vvvvwaf = [];
+		var datadefault_vvvvwaf = [];
-		datatype_vvvvwaf.push(temp_vvvvwaf);
+		datadefault_vvvvwaf.push(temp_vvvvwaf);
 	}
-	else if (!isSet(datatype_vvvvwaf))
+	else if (!isSet(datadefault_vvvvwaf))
 	{
-		var datatype_vvvvwaf = [];
+		var datadefault_vvvvwaf = [];
 	}
-	var datatype = datatype_vvvvwaf.some(datatype_vvvvwaf_SomeFunc);
+	var datadefault = datadefault_vvvvwaf.some(datadefault_vvvvwaf_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		if (jform_vvvvwafvzr_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwafvzr_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		if (!jform_vvvvwafvzr_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwafvzr_required = true;
 		}
 	}
 }
 
 // the vvvvwaf Some function
-function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf)
+function datadefault_vvvvwaf_SomeFunc(datadefault_vvvvwaf)
 {
 	// set the function logic
-	if (datatype_vvvvwaf == 'CHAR' || datatype_vvvvwaf == 'VARCHAR' || datatype_vvvvwaf == 'TEXT' || datatype_vvvvwaf == 'MEDIUMTEXT' || datatype_vvvvwaf == 'LONGTEXT')
+	if (datadefault_vvvvwaf == 'Other')
 	{
 		return true;
 	}
@@ -289,20 +175,8 @@ function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf)
 }
 
 // the vvvvwag function
-function vvvvwag(store_vvvvwag,datatype_vvvvwag)
+function vvvvwag(datatype_vvvvwag)
 {
-	if (isSet(store_vvvvwag) && store_vvvvwag.constructor !== Array)
-	{
-		var temp_vvvvwag = store_vvvvwag;
-		var store_vvvvwag = [];
-		store_vvvvwag.push(temp_vvvvwag);
-	}
-	else if (!isSet(store_vvvvwag))
-	{
-		var store_vvvvwag = [];
-	}
-	var store = store_vvvvwag.some(store_vvvvwag_SomeFunc);
-
 	if (isSet(datatype_vvvvwag) && datatype_vvvvwag.constructor !== Array)
 	{
 		var temp_vvvvwag = datatype_vvvvwag;
@@ -316,6 +190,132 @@ function vvvvwag(store_vvvvwag,datatype_vvvvwag)
 	var datatype = datatype_vvvvwag.some(datatype_vvvvwag_SomeFunc);
 
 
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwagvzs_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwagvzs_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		if (!jform_vvvvwagvzs_required)
+		{
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwagvzs_required = true;
+		}
+	}
+}
+
+// the vvvvwag Some function
+function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+{
+	// set the function logic
+	if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'DATETIME' || datatype_vvvvwag == 'DATE' || datatype_vvvvwag == 'TIME' || datatype_vvvvwag == 'INT' || datatype_vvvvwag == 'TINYINT' || datatype_vvvvwag == 'BIGINT' || datatype_vvvvwag == 'FLOAT' || datatype_vvvvwag == 'DECIMAL' || datatype_vvvvwag == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwah function
+function vvvvwah(datatype_vvvvwah)
+{
+	if (isSet(datatype_vvvvwah) && datatype_vvvvwah.constructor !== Array)
+	{
+		var temp_vvvvwah = datatype_vvvvwah;
+		var datatype_vvvvwah = [];
+		datatype_vvvvwah.push(temp_vvvvwah);
+	}
+	else if (!isSet(datatype_vvvvwah))
+	{
+		var datatype_vvvvwah = [];
+	}
+	var datatype = datatype_vvvvwah.some(datatype_vvvvwah_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwahvzt_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwahvzt_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwahvzt_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwahvzt_required = true;
+		}
+	}
+}
+
+// the vvvvwah Some function
+function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
+{
+	// set the function logic
+	if (datatype_vvvvwah == 'CHAR' || datatype_vvvvwah == 'VARCHAR' || datatype_vvvvwah == 'TEXT' || datatype_vvvvwah == 'MEDIUMTEXT' || datatype_vvvvwah == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwai function
+function vvvvwai(store_vvvvwai,datatype_vvvvwai)
+{
+	if (isSet(store_vvvvwai) && store_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = store_vvvvwai;
+		var store_vvvvwai = [];
+		store_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(store_vvvvwai))
+	{
+		var store_vvvvwai = [];
+	}
+	var store = store_vvvvwai.some(store_vvvvwai_SomeFunc);
+
+	if (isSet(datatype_vvvvwai) && datatype_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = datatype_vvvvwai;
+		var datatype_vvvvwai = [];
+		datatype_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(datatype_vvvvwai))
+	{
+		var datatype_vvvvwai = [];
+	}
+	var datatype = datatype_vvvvwai.some(datatype_vvvvwai_SomeFunc);
+
+
 	// set this function logic
 	if (store && datatype)
 	{
@@ -327,148 +327,148 @@ function vvvvwag(store_vvvvwag,datatype_vvvvwag)
 	}
 }
 
-// the vvvvwag Some function
+// the vvvvwai Some function
-function store_vvvvwag_SomeFunc(store_vvvvwag)
+function store_vvvvwai_SomeFunc(store_vvvvwai)
 {
 	// set the function logic
-	if (store_vvvvwag == 4)
+	if (store_vvvvwai == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwag Some function
+// the vvvvwai Some function
-function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
 {
 	// set the function logic
-	if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'TEXT' || datatype_vvvvwag == 'MEDIUMTEXT' || datatype_vvvvwag == 'LONGTEXT')
+	if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'TEXT' || datatype_vvvvwai == 'MEDIUMTEXT' || datatype_vvvvwai == 'LONGTEXT')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwai function
+// the vvvvwak function
-function vvvvwai(add_css_view_vvvvwai)
+function vvvvwak(add_css_view_vvvvwak)
 {
 	// set the function logic
-	if (add_css_view_vvvvwai == 1)
+	if (add_css_view_vvvvwak == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwaivzs_required)
+		if (jform_vvvvwakvzu_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_vvvvwaivzs_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwaivzs_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_vvvvwaivzs_required = true;
-		}
-	}
-}
-
-// the vvvvwaj function
-function vvvvwaj(add_css_views_vvvvwaj)
-{
-	// set the function logic
-	if (add_css_views_vvvvwaj == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwajvzt_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_vvvvwajvzt_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwajvzt_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_vvvvwajvzt_required = true;
-		}
-	}
-}
-
-// the vvvvwak function
-function vvvvwak(add_javascript_view_footer_vvvvwak)
-{
-	// set the function logic
-	if (add_javascript_view_footer_vvvvwak == 1)
-	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwakvzu_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_vvvvwakvzu_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		jQuery('#jform_css_view').closest('.control-group').hide();
 		if (!jform_vvvvwakvzu_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
+			updateFieldRequired('css_view',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwakvzu_required = true;
 		}
 	}
 }
 
 // the vvvvwal function
-function vvvvwal(add_javascript_views_footer_vvvvwal)
+function vvvvwal(add_css_views_vvvvwal)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwal == 1)
+	if (add_css_views_vvvvwal == 1)
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		jQuery('#jform_css_views').closest('.control-group').show();
 		if (jform_vvvvwalvzv_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
+			updateFieldRequired('css_views',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwalvzv_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_css_views').closest('.control-group').hide();
 		if (!jform_vvvvwalvzv_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_vvvvwalvzv_required = true;
+		}
+	}
+}
+
+// the vvvvwam function
+function vvvvwam(add_javascript_view_footer_vvvvwam)
+{
+	// set the function logic
+	if (add_javascript_view_footer_vvvvwam == 1)
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		if (jform_vvvvwamvzw_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_vvvvwamvzw_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		if (!jform_vvvvwamvzw_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_vvvvwamvzw_required = true;
+		}
+	}
+}
+
+// the vvvvwan function
+function vvvvwan(add_javascript_views_footer_vvvvwan)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwan == 1)
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		if (jform_vvvvwanvzx_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_vvvvwanvzx_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		if (!jform_vvvvwanvzx_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_vvvvwalvzv_required = true;
+			jform_vvvvwanvzx_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -23,207 +23,97 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwamvzy_required = false;
-jform_vvvvwanvzz_required = false;
 jform_vvvvwaowaa_required = false;
 jform_vvvvwapwab_required = false;
 jform_vvvvwaqwac_required = false;
 jform_vvvvwarwad_required = false;
+jform_vvvvwaswae_required = false;
+jform_vvvvwatwaf_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
-
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
 
 	var type_vvvvwaq = jQuery("#jform_type").val();
 	vvvvwaq(type_vvvvwaq);
 
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwar = jQuery("#jform_type").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwar(type_vvvvwar);
+
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwat(target_vvvvwat);
 });
 
-// the vvvvwam function
+// the vvvvwao function
-function vvvvwam(location_vvvvwam)
+function vvvvwao(location_vvvvwao)
 {
 	// set the function logic
-	if (location_vvvvwam == 1)
+	if (location_vvvvwao == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwamvzy_required)
+		if (jform_vvvvwaowaa_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_vvvvwamvzy_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwamvzy_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_vvvvwamvzy_required = true;
-		}
-	}
-}
-
-// the vvvvwan function
-function vvvvwan(location_vvvvwan)
-{
-	// set the function logic
-	if (location_vvvvwan == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwanvzz_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_vvvvwanvzz_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwanvzz_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_vvvvwanvzz_required = true;
-		}
-	}
-}
-
-// the vvvvwao function
-function vvvvwao(type_vvvvwao)
-{
-	if (isSet(type_vvvvwao) && type_vvvvwao.constructor !== Array)
-	{
-		var temp_vvvvwao = type_vvvvwao;
-		var type_vvvvwao = [];
-		type_vvvvwao.push(temp_vvvvwao);
-	}
-	else if (!isSet(type_vvvvwao))
-	{
-		var type_vvvvwao = [];
-	}
-	var type = type_vvvvwao.some(type_vvvvwao_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaowaa_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
 			jform_vvvvwaowaa_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwaowaa_required)
 		{
-			updateFieldRequired('url',1);
+			updateFieldRequired('admin_view',1);
-			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_admin_view').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_admin_view').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
+			jQuery('#jform_admin_view').removeClass('required');
 			jform_vvvvwaowaa_required = true;
 		}
 	}
 }
 
-// the vvvvwao Some function
+// the vvvvwap function
-function type_vvvvwao_SomeFunc(type_vvvvwao)
+function vvvvwap(location_vvvvwap)
 {
 	// set the function logic
-	if (type_vvvvwao == 3)
+	if (location_vvvvwap == 2)
 	{
-		return true;
+		jQuery('#jform_site_view').closest('.control-group').show();
-	}
-	return false;
-}
-
-// the vvvvwap function
-function vvvvwap(type_vvvvwap)
-{
-	if (isSet(type_vvvvwap) && type_vvvvwap.constructor !== Array)
-	{
-		var temp_vvvvwap = type_vvvvwap;
-		var type_vvvvwap = [];
-		type_vvvvwap.push(temp_vvvvwap);
-	}
-	else if (!isSet(type_vvvvwap))
-	{
-		var type_vvvvwap = [];
-	}
-	var type = type_vvvvwap.some(type_vvvvwap_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwapwab_required)
 		{
-			updateFieldRequired('article',0);
+			updateFieldRequired('site_view',0);
-			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwapwab_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwapwab_required)
 		{
-			updateFieldRequired('article',1);
+			updateFieldRequired('site_view',1);
-			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwapwab_required = true;
 		}
 	}
 }
 
-// the vvvvwap Some function
-function type_vvvvwap_SomeFunc(type_vvvvwap)
-{
-	// set the function logic
-	if (type_vvvvwap == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaq function
 function vvvvwaq(type_vvvvwaq)
 {
@@ -243,26 +133,26 @@ function vvvvwaq(type_vvvvwaq)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwaqwac_required)
 		{
-			updateFieldRequired('content',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwaqwac_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwaqwac_required)
 		{
-			updateFieldRequired('content',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwaqwac_required = true;
 		}
 	}
@@ -272,7 +162,7 @@ function vvvvwaq(type_vvvvwaq)
 function type_vvvvwaq_SomeFunc(type_vvvvwaq)
 {
 	// set the function logic
-	if (type_vvvvwaq == 2)
+	if (type_vvvvwaq == 3)
 	{
 		return true;
 	}
@@ -280,32 +170,142 @@ function type_vvvvwaq_SomeFunc(type_vvvvwaq)
 }
 
 // the vvvvwar function
-function vvvvwar(target_vvvvwar)
+function vvvvwar(type_vvvvwar)
 {
-	// set the function logic
+	if (isSet(type_vvvvwar) && type_vvvvwar.constructor !== Array)
-	if (target_vvvvwar == 1)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwar = type_vvvvwar;
+		var type_vvvvwar = [];
+		type_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(type_vvvvwar))
+	{
+		var type_vvvvwar = [];
+	}
+	var type = type_vvvvwar.some(type_vvvvwar_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwarwad_required)
 		{
-			updateFieldRequired('groups',0);
+			updateFieldRequired('article',0);
-			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwarwad_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwarwad_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwarwad_required = true;
+		}
+	}
+}
+
+// the vvvvwar Some function
+function type_vvvvwar_SomeFunc(type_vvvvwar)
+{
+	// set the function logic
+	if (type_vvvvwar == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwas function
+function vvvvwas(type_vvvvwas)
+{
+	if (isSet(type_vvvvwas) && type_vvvvwas.constructor !== Array)
+	{
+		var temp_vvvvwas = type_vvvvwas;
+		var type_vvvvwas = [];
+		type_vvvvwas.push(temp_vvvvwas);
+	}
+	else if (!isSet(type_vvvvwas))
+	{
+		var type_vvvvwas = [];
+	}
+	var type = type_vvvvwas.some(type_vvvvwas_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwaswae_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwaswae_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwaswae_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwaswae_required = true;
+		}
+	}
+}
+
+// the vvvvwas Some function
+function type_vvvvwas_SomeFunc(type_vvvvwas)
+{
+	// set the function logic
+	if (type_vvvvwas == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwat function
+function vvvvwat(target_vvvvwat)
+{
+	// set the function logic
+	if (target_vvvvwat == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwatwaf_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwatwaf_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwatwaf_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwarwad_required = true;
+			jform_vvvvwatwaf_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvytvyp_required = false;
+jform_vvvvvyvvyr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyv = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyt(add_php_view_vvvvvyt);
+	vvvvvyv(add_php_view_vvvvvyv);
 });
 
-// the vvvvvyt function
+// the vvvvvyv function
-function vvvvvyt(add_php_view_vvvvvyt)
+function vvvvvyv(add_php_view_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyt == 1)
+	if (add_php_view_vvvvvyv == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvytvyp_required)
+		if (jform_vvvvvyvvyr_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;
+			jform_vvvvvyvvyr_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvytvyp_required)
+		if (!jform_vvvvvyvvyr_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;
+			jform_vvvvvyvvyr_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -23,18 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzvvzm_required = false;
+jform_vvvvvzxvzo_required = false;
-jform_vvvvwabvzn_required = false;
+jform_vvvvwadvzp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
 	var how_vvvvvzw = jQuery("#jform_how").val();
 	vvvvvzw(how_vvvvvzw);
 
@@ -50,103 +44,16 @@ jQuery(document).ready(function()
 	var how_vvvvwaa = jQuery("#jform_how").val();
 	vvvvwaa(how_vvvvwaa);
 
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwab(how_vvvvwab);
+
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad);
 });
 
-// the vvvvvzu function
-function vvvvvzu(how_vvvvvzu)
-{
-	if (isSet(how_vvvvvzu) && how_vvvvvzu.constructor !== Array)
-	{
-		var temp_vvvvvzu = how_vvvvvzu;
-		var how_vvvvvzu = [];
-		how_vvvvvzu.push(temp_vvvvvzu);
-	}
-	else if (!isSet(how_vvvvvzu))
-	{
-		var how_vvvvvzu = [];
-	}
-	var how = how_vvvvvzu.some(how_vvvvvzu_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvvzu Some function
-function how_vvvvvzu_SomeFunc(how_vvvvvzu)
-{
-	// set the function logic
-	if (how_vvvvvzu == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzv function
-function vvvvvzv(how_vvvvvzv)
-{
-	if (isSet(how_vvvvvzv) && how_vvvvvzv.constructor !== Array)
-	{
-		var temp_vvvvvzv = how_vvvvvzv;
-		var how_vvvvvzv = [];
-		how_vvvvvzv.push(temp_vvvvvzv);
-	}
-	else if (!isSet(how_vvvvvzv))
-	{
-		var how_vvvvvzv = [];
-	}
-	var how = how_vvvvvzv.some(how_vvvvvzv_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvvzvvzm_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_vvvvvzvvzm_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzm_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_vvvvvzvvzm_required = true;
-		}
-	}
-}
-
-// the vvvvvzv Some function
-function how_vvvvvzv_SomeFunc(how_vvvvvzv)
-{
-	// set the function logic
-	if (how_vvvvvzv == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzw function
 function vvvvvzw(how_vvvvvzw)
 {
@@ -166,11 +73,11 @@ function vvvvvzw(how_vvvvvzw)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -178,7 +85,7 @@ function vvvvvzw(how_vvvvvzw)
 function how_vvvvvzw_SomeFunc(how_vvvvvzw)
 {
 	// set the function logic
-	if (how_vvvvvzw == 2 || how_vvvvvzw == 3)
+	if (how_vvvvvzw == 2)
 	{
 		return true;
 	}
@@ -204,11 +111,28 @@ function vvvvvzx(how_vvvvvzx)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvvzxvzo_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_vvvvvzxvzo_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvvzxvzo_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_vvvvvzxvzo_required = true;
+		}
 	}
 }
 
@@ -216,7 +140,7 @@ function vvvvvzx(how_vvvvvzx)
 function how_vvvvvzx_SomeFunc(how_vvvvvzx)
 {
 	// set the function logic
-	if (how_vvvvvzx == 1 || how_vvvvvzx == 2 || how_vvvvvzx == 3)
+	if (how_vvvvvzx == 3)
 	{
 		return true;
 	}
@@ -242,15 +166,11 @@ function vvvvvzy(how_vvvvvzy)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -258,7 +178,7 @@ function vvvvvzy(how_vvvvvzy)
 function how_vvvvvzy_SomeFunc(how_vvvvvzy)
 {
 	// set the function logic
-	if (how_vvvvvzy == 0)
+	if (how_vvvvvzy == 2 || how_vvvvvzy == 3)
 	{
 		return true;
 	}
@@ -284,13 +204,11 @@ function vvvvvzz(how_vvvvvzz)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -298,7 +216,7 @@ function vvvvvzz(how_vvvvvzz)
 function how_vvvvvzz_SomeFunc(how_vvvvvzz)
 {
 	// set the function logic
-	if (how_vvvvvzz == 1)
+	if (how_vvvvvzz == 1 || how_vvvvvzz == 2 || how_vvvvvzz == 3)
 	{
 		return true;
 	}
@@ -321,6 +239,88 @@ function vvvvwaa(how_vvvvwaa)
 	var how = how_vvvvwaa.some(how_vvvvwaa_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaa Some function
+function how_vvvvwaa_SomeFunc(how_vvvvwaa)
+{
+	// set the function logic
+	if (how_vvvvwaa == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwab function
+function vvvvwab(how_vvvvwab)
+{
+	if (isSet(how_vvvvwab) && how_vvvvwab.constructor !== Array)
+	{
+		var temp_vvvvwab = how_vvvvwab;
+		var how_vvvvwab = [];
+		how_vvvvwab.push(temp_vvvvwab);
+	}
+	else if (!isSet(how_vvvvwab))
+	{
+		var how_vvvvwab = [];
+	}
+	var how = how_vvvvwab.some(how_vvvvwab_SomeFunc);
+
+
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwab Some function
+function how_vvvvwab_SomeFunc(how_vvvvwab)
+{
+	// set the function logic
+	if (how_vvvvwab == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwac function
+function vvvvwac(how_vvvvwac)
+{
+	if (isSet(how_vvvvwac) && how_vvvvwac.constructor !== Array)
+	{
+		var temp_vvvvwac = how_vvvvwac;
+		var how_vvvvwac = [];
+		how_vvvvwac.push(temp_vvvvwac);
+	}
+	else if (!isSet(how_vvvvwac))
+	{
+		var how_vvvvwac = [];
+	}
+	var how = how_vvvvwac.some(how_vvvvwac_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -336,44 +336,44 @@ function vvvvwaa(how_vvvvwaa)
 	}
 }
 
-// the vvvvwaa Some function
+// the vvvvwac Some function
-function how_vvvvwaa_SomeFunc(how_vvvvwaa)
+function how_vvvvwac_SomeFunc(how_vvvvwac)
 {
 	// set the function logic
-	if (how_vvvvwaa == 4)
+	if (how_vvvvwac == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwab function
+// the vvvvwad function
-function vvvvwab(type_vvvvwab)
+function vvvvwad(type_vvvvwad)
 {
 	// set the function logic
-	if (type_vvvvwab == 2)
+	if (type_vvvvwad == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwabvzn_required)
+		if (jform_vvvvwadvzp_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwabvzn_required = false;
+			jform_vvvvwadvzp_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwabvzn_required)
+		if (!jform_vvvvwadvzp_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwabvzn_required = true;
+			jform_vvvvwadvzp_required = true;
 		}
 	}
 }

admin/models/forms/site_view.js

@@ -23,7 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyivye_required = false;
 jform_vvvvvyjvyf_required = false;
 jform_vvvvvykvyg_required = false;
 jform_vvvvvylvyh_required = false;
@@ -32,274 +31,310 @@ jform_vvvvvynvyj_required = false;
 jform_vvvvvyovyk_required = false;
 jform_vvvvvypvyl_required = false;
 jform_vvvvvyqvym_required = false;
-jform_vvvvvyqvyn_required = false;
+jform_vvvvvyrvyn_required = false;
+jform_vvvvvysvyo_required = false;
+jform_vvvvvysvyp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyp(add_js_document_vvvvvyp);
 
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyq(add_css_vvvvvyq);
 
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvys(add_custom_button_vvvvvys);
+
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
+	vvvvvyt(button_position_vvvvvyt);
 });
 
-// the vvvvvyi function
+// the vvvvvyj function
-function vvvvvyi(add_php_view_vvvvvyi)
+function vvvvvyj(add_php_view_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyi == 1)
+	if (add_php_view_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvyjvyf_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_vvvvvyivye_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_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_vvvvvyivye_required = true;
-		}
-	}
-}
-
-// the vvvvvyj function
-function vvvvvyj(add_php_jview_display_vvvvvyj)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyj == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyjvyf_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_vvvvvyjvyf_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
+		jQuery('#jform_php_view').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyf_required)
 		{
-			updateFieldRequired('php_jview_display',1);
+			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyjvyf_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_php_jview_vvvvvyk)
+function vvvvvyk(add_php_jview_display_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyk == 1)
+	if (add_php_jview_display_vvvvvyk == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvykvyg_required)
 		{
-			updateFieldRequired('php_jview',0);
+			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvykvyg_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvykvyg_required)
 		{
-			updateFieldRequired('php_jview',1);
+			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvykvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_php_document_vvvvvyl)
+function vvvvvyl(add_php_jview_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyl == 1)
+	if (add_php_jview_vvvvvyl == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvylvyh_required)
 		{
-			updateFieldRequired('php_document',0);
+			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvylvyh_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvylvyh_required)
 		{
-			updateFieldRequired('php_document',1);
+			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvylvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_css_document_vvvvvym)
+function vvvvvym(add_php_document_vvvvvym)
 {
 	// set the function logic
-	if (add_css_document_vvvvvym == 1)
+	if (add_php_document_vvvvvym == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('css_document',0);
+			updateFieldRequired('php_document',0);
-			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvymvyi_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('css_document',1);
+			updateFieldRequired('php_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvymvyi_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_js_document_vvvvvyn)
+function vvvvvyn(add_css_document_vvvvvyn)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyn == 1)
+	if (add_css_document_vvvvvyn == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('css_document',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvynvyj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('css_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvynvyj_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_css_vvvvvyo)
+function vvvvvyo(add_javascript_file_vvvvvyo)
 {
 	// set the function logic
-	if (add_css_vvvvvyo == 1)
+	if (add_javascript_file_vvvvvyo == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('css',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyovyk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('css',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyovyk_required = true;
 		}
 	}
 }
 
 // the vvvvvyp function
-function vvvvvyp(add_php_ajax_vvvvvyp)
+function vvvvvyp(add_js_document_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyp == 1)
+	if (add_js_document_vvvvvyp == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvypvyl_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_vvvvvypvyl_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvypvyl_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_vvvvvypvyl_required = true;
+		}
+	}
+}
+
+// the vvvvvyq function
+function vvvvvyq(add_css_vvvvvyq)
+{
+	// set the function logic
+	if (add_css_vvvvvyq == 1)
+	{
+		jQuery('#jform_css').closest('.control-group').show();
+		if (jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyqvym_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css').closest('.control-group').hide();
+		if (!jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyqvym_required = true;
+		}
+	}
+}
+
+// the vvvvvyr function
+function vvvvvyr(add_php_ajax_vvvvvyr)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyr == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvyrvyn_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_vvvvvypvyl_required = false;
+			jform_vvvvvyrvyn_required = false;
 		}
 
 	}
@@ -307,42 +342,42 @@ function vvvvvyp(add_php_ajax_vvvvvyp)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvyrvyn_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_vvvvvypvyl_required = true;
+			jform_vvvvvyrvyn_required = true;
 		}
 	}
 }
 
-// the vvvvvyq function
+// the vvvvvys function
-function vvvvvyq(add_custom_button_vvvvvyq)
+function vvvvvys(add_custom_button_vvvvvys)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyq == 1)
+	if (add_custom_button_vvvvvys == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyqvym_required)
+		if (jform_vvvvvysvyo_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_vvvvvyqvym_required = false;
+			jform_vvvvvysvyo_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyqvyn_required)
+		if (jform_vvvvvysvyp_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_vvvvvyqvyn_required = false;
+			jform_vvvvvysvyp_required = false;
 		}
 
 	}
@@ -350,40 +385,40 @@ function vvvvvyq(add_custom_button_vvvvvyq)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyqvym_required)
+		if (!jform_vvvvvysvyo_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_vvvvvyqvym_required = true;
+			jform_vvvvvysvyo_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyn_required)
+		if (!jform_vvvvvysvyp_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_vvvvvyqvyn_required = true;
+			jform_vvvvvysvyp_required = true;
 		}
 	}
 }
 
-// the vvvvvyr function
+// the vvvvvyt function
-function vvvvvyr(button_position_vvvvvyr)
+function vvvvvyt(button_position_vvvvvyt)
 {
-	if (isSet(button_position_vvvvvyr) && button_position_vvvvvyr.constructor !== Array)
+	if (isSet(button_position_vvvvvyt) && button_position_vvvvvyt.constructor !== Array)
 	{
-		var temp_vvvvvyr = button_position_vvvvvyr;
+		var temp_vvvvvyt = button_position_vvvvvyt;
-		var button_position_vvvvvyr = [];
+		var button_position_vvvvvyt = [];
-		button_position_vvvvvyr.push(temp_vvvvvyr);
+		button_position_vvvvvyt.push(temp_vvvvvyt);
 	}
-	else if (!isSet(button_position_vvvvvyr))
+	else if (!isSet(button_position_vvvvvyt))
 	{
-		var button_position_vvvvvyr = [];
+		var button_position_vvvvvyt = [];
 	}
-	var button_position = button_position_vvvvvyr.some(button_position_vvvvvyr_SomeFunc);
+	var button_position = button_position_vvvvvyt.some(button_position_vvvvvyt_SomeFunc);
 
 
 	// set this function logic
@@ -397,11 +432,11 @@ function vvvvvyr(button_position_vvvvvyr)
 	}
 }
 
-// the vvvvvyr Some function
+// the vvvvvyt Some function
-function button_position_vvvvvyr_SomeFunc(button_position_vvvvvyr)
+function button_position_vvvvvyt_SomeFunc(button_position_vvvvvyt)
 {
 	// set the function logic
-	if (button_position_vvvvvyr == 5)
+	if (button_position_vvvvvyt == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.xml

@@ -138,27 +138,6 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Js_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
                 <!-- Css Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css"
@@ -170,6 +149,16 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT"
                        required="true" />
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="false"
+                       button="true" />
                 <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_add_language_string"
@@ -177,6 +166,17 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
                        heading="h4"
                        class="note_add_language_string" />
+                <!-- Js_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="js_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
+                       required="true" />
                 <!-- Add_php_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_document"
@@ -188,6 +188,12 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
                 <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_libraries_selection"
@@ -195,17 +201,12 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_libraries_selection" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="radio"
+                <field type="note"
-                       name="add_php_jview_display"
+                       name="note_snippet_usage"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
-                       class="btn-group btn-group-yesno"
+                       heading="h4"
-                       default="0"
+                       class="snippet-usage note_snippet_usage" />
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
                 <!-- Css_document Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css_document"
@@ -217,12 +218,16 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT"
                        required="true" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Default Field. Type: Textarea. (joomla)-->
-                <field type="note"
+                <field type="textarea"
-                       name="note_uikit_snippet"
+                       name="default"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
-                       heading="h4"
+                       rows="20"
-                       class="snippet-code note_uikit_snippet" />
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
+                       required="true" />
                 <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_ajaxmethod"
@@ -234,12 +239,17 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT"
                        required="true" />
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
-                <field type="note"
+                <field type="radio"
-                       name="note_snippet_usage"
+                       name="add_php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-                       heading="h4"
+                       class="btn-group btn-group-yesno"
-                       class="snippet-usage note_snippet_usage" />
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                 <!-- Add_php_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_view"
@@ -251,15 +261,16 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
-                <!-- Default Field. Type: Textarea. (joomla)-->
+                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                       name="default"
+                       name="javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
-                       rows="20"
+                       rows="30"
                        cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
                        class="text_area span12"
                        filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT"
                        required="true" />
                 <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
@@ -283,25 +294,15 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
                        required="false" />
-                <!-- Php_controller Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_controller"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
-                       required="false" />
                 <!-- Not_required Field. Type: Hidden. (joomla)-->
                 <field type="hidden"
                        name="not_required"
                        default="[]" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_js_document"
+                       name="add_javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -315,10 +316,10 @@
                        label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL"
                        description="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION"
                        multiple="true" />
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css_document"
+                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -334,10 +335,10 @@
                        multiple="false"
                        required="true"
                        button="true" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css"
+                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -352,10 +353,10 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
                        multiple="false"
                        required="false" />
-                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <!-- Add_css Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_ajax"
+                       name="add_css"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -370,6 +371,28 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION"
                        heading="h4"
                        class="dynamic_values" />
+                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_ajax"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_button"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                 <!-- Ajax_input Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="ajax_input"
@@ -477,28 +500,6 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_custom_button"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
                 <!-- Button_position Field. Type: List. (joomla)-->
                 <field type="list"
                        name="button_position"
@@ -517,6 +518,24 @@
                         <option value="4">COM_COMPONENTBUILDER_SITE_VIEW_BOTTOM_LEFT</option>
                         <option value="5">COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM</option>
                 </field>
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_custom_toolbar_placeholder"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION"
+                       heading="h4"
+                       class="note_custom_toolbar_placeholder"
+                       showon="button_position:5" />
                 <!-- Php_view Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_view"
@@ -528,24 +547,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT"
                        required="true" />
-                <!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_custom_toolbar_placeholder"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION"
-                       heading="h4"
-                       class="note_custom_toolbar_placeholder"
-                       showon="button_position:5" />
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
                 <!-- Custom_button Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="custom_button"
@@ -833,6 +834,28 @@
                                 </field>
                         </form>
                 </field>
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
+                <!-- Php_controller Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_controller"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
+                       required="false" />
                 <!-- Php_jview Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview"

admin/models/forms/template.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvysvyo_required = false;
+jform_vvvvvyuvyq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyu(add_php_view_vvvvvyu);
 });
 
-// the vvvvvys function
+// the vvvvvyu function
-function vvvvvys(add_php_view_vvvvvys)
+function vvvvvyu(add_php_view_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_view_vvvvvys == 1)
+	if (add_php_view_vvvvvyu == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvyuvyq_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvysvyo_required = true;
+			jform_vvvvvyuvyq_required = true;
 		}
 	}
 }

admin/models/ftp.php

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

admin/models/site_view.php

@@ -127,48 +127,48 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->js_document))
-			{
-				// base64 Decode js_document.
-				$item->js_document = base64_decode($item->js_document);
-			}
-
 			if (!empty($item->css))
 			{
 				// base64 Decode css.
 				$item->css = base64_decode($item->css);
 			}
 
+			if (!empty($item->js_document))
+			{
+				// base64 Decode js_document.
+				$item->js_document = base64_decode($item->js_document);
+			}
+
 			if (!empty($item->css_document))
 			{
 				// base64 Decode css_document.
 				$item->css_document = base64_decode($item->css_document);
 			}
 
-			if (!empty($item->php_ajaxmethod))
-			{
-				// base64 Decode php_ajaxmethod.
-				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-			}
-
 			if (!empty($item->default))
 			{
 				// base64 Decode default.
 				$item->default = base64_decode($item->default);
 			}
 
+			if (!empty($item->php_ajaxmethod))
+			{
+				// base64 Decode php_ajaxmethod.
+				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+			}
+
+			if (!empty($item->javascript_file))
+			{
+				// base64 Decode javascript_file.
+				$item->javascript_file = base64_decode($item->javascript_file);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
 				$item->php_model = base64_decode($item->php_model);
 			}
 
-			if (!empty($item->php_controller))
-			{
-				// base64 Decode php_controller.
-				$item->php_controller = base64_decode($item->php_controller);
-			}
-
 			if (!empty($item->php_document))
 			{
 				// base64 Decode php_document.
@@ -187,6 +187,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_jview_display = base64_decode($item->php_jview_display);
 			}
 
+			if (!empty($item->php_controller))
+			{
+				// base64 Decode php_controller.
+				$item->php_controller = base64_decode($item->php_controller);
+			}
+
 			if (!empty($item->php_jview))
 			{
 				// base64 Decode php_jview.
@@ -1010,48 +1016,48 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the js_document string to base64 string.
-		if (isset($data['js_document']))
-		{
-			$data['js_document'] = base64_encode($data['js_document']);
-		}
-
 		// Set the css string to base64 string.
 		if (isset($data['css']))
 		{
 			$data['css'] = base64_encode($data['css']);
 		}
 
+		// Set the js_document string to base64 string.
+		if (isset($data['js_document']))
+		{
+			$data['js_document'] = base64_encode($data['js_document']);
+		}
+
 		// Set the css_document string to base64 string.
 		if (isset($data['css_document']))
 		{
 			$data['css_document'] = base64_encode($data['css_document']);
 		}
 
-		// Set the php_ajaxmethod string to base64 string.
-		if (isset($data['php_ajaxmethod']))
-		{
-			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
-		}
-
 		// Set the default string to base64 string.
 		if (isset($data['default']))
 		{
 			$data['default'] = base64_encode($data['default']);
 		}
 
+		// Set the php_ajaxmethod string to base64 string.
+		if (isset($data['php_ajaxmethod']))
+		{
+			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
+		}
+
+		// Set the javascript_file string to base64 string.
+		if (isset($data['javascript_file']))
+		{
+			$data['javascript_file'] = base64_encode($data['javascript_file']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
-		// Set the php_controller string to base64 string.
-		if (isset($data['php_controller']))
-		{
-			$data['php_controller'] = base64_encode($data['php_controller']);
-		}
-
 		// Set the php_document string to base64 string.
 		if (isset($data['php_document']))
 		{
@@ -1070,6 +1076,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
 		}
 
+		// Set the php_controller string to base64 string.
+		if (isset($data['php_controller']))
+		{
+			$data['php_controller'] = base64_encode($data['php_controller']);
+		}
+
 		// Set the php_jview string to base64 string.
 		if (isset($data['php_jview']))
 		{

admin/models/site_views.php

@@ -266,26 +266,28 @@ class ComponentbuilderModelSite_views extends JModelList
 							continue;
 						}
 
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
 						// decode css
 						$item->css = base64_decode($item->css);
+						// decode js_document
+						$item->js_document = base64_decode($item->js_document);
 						// decode css_document
 						$item->css_document = base64_decode($item->css_document);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 						// decode default
 						$item->default = base64_decode($item->default);
+						// decode php_ajaxmethod
+						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
 						// decode php_jview_display
 						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_controller
+						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_jview
 						$item->php_jview = base64_decode($item->php_jview);
 						// unset the values we don't want exported.

admin/sql/install.mysql.utf8.sql

@@ -257,6 +257,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
@@ -271,6 +272,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`icon` CHAR(64) NOT NULL DEFAULT '',
+	`javascript_file` TEXT NOT NULL,
 	`js_document` TEXT NOT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
@@ -304,13 +306,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_codename` (`codename`),
-	KEY `idx_add_php_jview` (`add_php_jview`),
 	KEY `idx_add_css_document` (`add_css_document`),
+	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_add_php_document` (`add_php_document`),
 	KEY `idx_add_php_jview_display` (`add_php_jview_display`),
-	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_php_view` (`add_php_view`),
+	KEY `idx_add_php_jview` (`add_php_jview`),
+	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_main_get` (`main_get`),
 	KEY `idx_dynamic_get` (`dynamic_get`),
 	KEY `idx_add_custom_button` (`add_custom_button`)
@@ -322,6 +325,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
@@ -338,6 +342,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`default` TEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
+	`javascript_file` TEXT NOT NULL,
 	`js_document` TEXT NOT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
@@ -376,11 +381,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	KEY `idx_add_php_jview_display` (`add_php_jview_display`),
 	KEY `idx_add_php_view` (`add_php_view`),
 	KEY `idx_add_php_jview` (`add_php_jview`),
+	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_add_js_document` (`add_js_document`),
-	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_main_get` (`main_get`),
-	KEY `idx_add_css` (`add_css`),
+	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_dynamic_get` (`dynamic_get`),
+	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_button_position` (`button_position`)

admin/sql/updates/mysql/2.6.6.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `javascript_file` TEXT NOT NULL AFTER `icon`;
+
+ALTER TABLE `#__componentbuilder_site_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
+
+ALTER TABLE `#__componentbuilder_site_view` ADD `javascript_file` TEXT NOT NULL AFTER `dynamic_get`;

admin/views/admin_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('admin_view');
 		$this->canEdit		= $this->canDo->get('admin_view.edit');

admin/views/admins_fields/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('admin_fields');
 		$this->canEdit		= $this->canDo->get('admin_fields.edit');

admin/views/admins_fields_conditions/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('admin_fields_conditions');
 		$this->canEdit		= $this->canDo->get('admin_fields_conditions.edit');

admin/views/components_admin_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_admin_views');
 		$this->canEdit		= $this->canDo->get('component_admin_views.edit');

admin/views/components_config/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_config');
 		$this->canEdit		= $this->canDo->get('component_config.edit');

admin/views/components_custom_admin_menus/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_custom_admin_menus');
 		$this->canEdit		= $this->canDo->get('component_custom_admin_menus.edit');

admin/views/components_custom_admin_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_custom_admin_views');
 		$this->canEdit		= $this->canDo->get('component_custom_admin_views.edit');

admin/views/components_dashboard/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_dashboard');
 		$this->canEdit		= $this->canDo->get('component_dashboard.edit');

admin/views/components_files_folders/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_files_folders');
 		$this->canEdit		= $this->canDo->get('component_files_folders.edit');

admin/views/components_mysql_tweaks/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_mysql_tweaks');
 		$this->canEdit		= $this->canDo->get('component_mysql_tweaks.edit');

admin/views/components_site_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_site_views');
 		$this->canEdit		= $this->canDo->get('component_site_views.edit');

admin/views/components_updates/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('component_updates');
 		$this->canEdit		= $this->canDo->get('component_updates.edit');

admin/views/custom_admin_view/tmpl/edit.php

@@ -93,12 +93,22 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'custom_script', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_SCRIPT', true)); ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'javascript_css', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">
 		</div>
 		<div class="row-fluid form-horizontal-desktop">
 			<div class="span12">
-				<?php echo JLayoutHelper::render('custom_admin_view.custom_script_fullwidth', $this); ?>
+				<?php echo JLayoutHelper::render('custom_admin_view.javascript_css_fullwidth', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'php', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('custom_admin_view.php_fullwidth', $this); ?>
 			</div>
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
@@ -228,48 +238,63 @@ jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyf function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyf function
+jQuery('#jform_add_javascript_file').on('keyup',function()
+{
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyf(add_javascript_file_vvvvvyf);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
+{
+	e.preventDefault();
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyf(add_javascript_file_vvvvvyf);
+
+});
+
+// #jform_add_js_document listeners for add_js_document_vvvvvyg function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyg(add_js_document_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyg(add_js_document_vvvvvyg);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyg function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyh function
+// #jform_add_css listeners for add_css_vvvvvyi function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyi(add_css_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyi(add_css_vvvvvyi);
 
 });
 

admin/views/custom_admin_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('custom_admin_view');
 		$this->canEdit		= $this->canDo->get('core.edit');

admin/views/custom_code/tmpl/edit.php

@@ -127,101 +127,101 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvvzq function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-});
-
-// #jform_target listeners for target_vvvvvzr function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
-});
-
 // #jform_target listeners for target_vvvvvzs function
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-
-// #jform_type listeners for type_vvvvvzs function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-
-// #jform_type listeners for type_vvvvvzt function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
 
 });
 
 // #jform_target listeners for target_vvvvvzt function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
+
+});
+
+// #jform_target listeners for target_vvvvvzu function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+
+// #jform_type listeners for type_vvvvvzu function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+
+// #jform_type listeners for type_vvvvvzv function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+
+// #jform_target listeners for target_vvvvvzv function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
 
 });
 

admin/views/custom_codes/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('custom_code');
 		$this->canEdit		= $this->canDo->get('custom_code.edit');

admin/views/dynamic_get/tmpl/edit.php

@@ -167,48 +167,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvyu function
+// #jform_gettype listeners for gettype_vvvvvyw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvyu = jQuery("#jform_gettype").val();
+	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyu(gettype_vvvvvyu);
+	vvvvvyw(gettype_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvyu = jQuery("#jform_gettype").val();
+	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyu(gettype_vvvvvyu);
+	vvvvvyw(gettype_vvvvvyw);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyv function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyv = jQuery("#jform_main_source").val();
-	vvvvvyv(main_source_vvvvvyv);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyv = jQuery("#jform_main_source").val();
-	vvvvvyv(main_source_vvvvvyv);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyw function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyw = jQuery("#jform_main_source").val();
-	vvvvvyw(main_source_vvvvvyw);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyw = jQuery("#jform_main_source").val();
-	vvvvvyw(main_source_vvvvvyw);
 
 });
 
@@ -242,52 +212,33 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvyz function
+// #jform_main_source listeners for main_source_vvvvvyz function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(addcalculation_vvvvvyz);
+	vvvvvyz(main_source_vvvvvyz);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(addcalculation_vvvvvyz);
+	vvvvvyz(main_source_vvvvvyz);
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvza function
+// #jform_main_source listeners for main_source_vvvvvza function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
+	vvvvvza(main_source_vvvvvza);
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
+	vvvvvza(main_source_vvvvvza);
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvza function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
 
 });
 
@@ -295,278 +246,327 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(addcalculation_vvvvvzb);
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(addcalculation_vvvvvzb);
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzb function
+// #jform_addcalculation listeners for addcalculation_vvvvvzc function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzc function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvze function
+// #jform_addcalculation listeners for addcalculation_vvvvvzd function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzd function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+
+// #jform_main_source listeners for main_source_vvvvvzg function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvze = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvze(main_source_vvvvvze);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvze = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvze(main_source_vvvvvze);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzf function
+// #jform_main_source listeners for main_source_vvvvvzh function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	vvvvvzh(main_source_vvvvvzh);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	vvvvvzh(main_source_vvvvvzh);
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzg function
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzi function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzg function
+// #jform_gettype listeners for gettype_vvvvvzi function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzh function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzj function
 jQuery('#jform_add_php_after_getitem').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzh function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzj function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(gettype_vvvvvzj);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(gettype_vvvvvzj);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzk function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzk function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzl function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
-{
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzl function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(gettype_vvvvvzl);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(gettype_vvvvvzl);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzm function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzm function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzm function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
+
+});
+
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzn function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzn function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzo function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(gettype_vvvvvzo);
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(gettype_vvvvvzo);
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzp function
+// #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
+	vvvvvzq(gettype_vvvvvzq);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
+	vvvvvzq(gettype_vvvvvzq);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzr function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(gettype_vvvvvzr);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(gettype_vvvvvzr);
 
 });
 

admin/views/dynamic_gets/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('dynamic_get');
 		$this->canEdit		= $this->canDo->get('dynamic_get.edit');

admin/views/field/tmpl/edit.php

@@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwac function
+// #jform_datalenght listeners for datalenght_vvvvwae function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwad function
+// #jform_datadefault listeners for datadefault_vvvvwaf function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwae function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwaf function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-});
-
-// #jform_store listeners for store_vvvvwag function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwag = jQuery("#jform_store").val();
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwag = jQuery("#jform_store").val();
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwag function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwai function
+// #jform_datatype listeners for datatype_vvvvwah function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
+	vvvvwah(datatype_vvvvwah);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
+	vvvvwah(datatype_vvvvwah);
+
+});
+
+// #jform_store listeners for store_vvvvwai function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwai function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwak function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwak(add_css_view_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwak(add_css_view_vvvvwak);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwaj function
+// #jform_add_css_views listeners for add_css_views_vvvvwal function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	vvvvwal(add_css_views_vvvvwal);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	vvvvwal(add_css_views_vvvvwal);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwak function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwam function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwam(add_javascript_view_footer_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwam(add_javascript_view_footer_vvvvwam);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwal function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwan function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 
 });
 

admin/views/fields/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('field');
 		$this->canEdit		= $this->canDo->get('field.edit');

admin/views/fieldtype/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vzwfields		= $this->get('Vzwfields');
+		$this->vzyfields		= $this->get('Vzyfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/fieldtypes/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('fieldtype');
 		$this->canEdit		= $this->canDo->get('fieldtype.edit');

admin/views/ftp/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vzxlinked_components		= $this->get('Vzxlinked_components');
+		$this->vzzlinked_components		= $this->get('Vzzlinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/ftps/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewFtps extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('ftp');
 		$this->canEdit		= $this->canDo->get('ftp.edit');

admin/views/get_snippets/view.html.php

@@ -79,6 +79,8 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		require_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );
 		// Initialize the header checker.
 		$HeaderCheck = new componentbuilderHeaderCheck;
+		// Add View JavaScript File
+		$this->document->addScript(JURI::root(true) . "/administrator/components/com_componentbuilder/assets/js/get_snippets.js"); 
 
 		// Load uikit options.
 		$uikit = $this->params->get('uikit_load');
@@ -189,6 +191,7 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		// set an error message if needed
 		$this->document->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".JText::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".JText::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
 		// need to add some language strings
+		JText::script('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS');
 		JText::script('COM_COMPONENTBUILDER_SNIPPETS');
 		JText::script('COM_COMPONENTBUILDER_SNIPPET');
 		JText::script('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION');
@@ -253,526 +256,6 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		}
 		// add the document default css file
 		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/get_snippets.css'); 
-		// Set the Custom JS script to view
-		$this->document->addScriptDeclaration("
-			// start the moment the document is ready
-			jQuery(document).ready(function () {
-				// just get the available libraries
-				getLibraries(snippetsPath);
-			});
-			
-			// add an ajax call tracker
-			var ajaxcall = null;
-			var fromLocal = false;
-			
-			jQuery(document).ready(function(){
-				jQuery('body').on('click','.getreaction',function(){
-					// Ajax request
-					var btn = jQuery(this);
-					btn.prop('disabled', true);
-					setTimeout(function(){
-						btn.prop('disabled', false);
-					}, 3000);
-					var type = btn.data('type');
-					if ('getLibraries' === type) {
-						getLibraries(snippetsPath);
-					} else if ('getSnippets' === type) {
-						var name = btn.data('name');
-						getSnippets(snippetsPath, name);
-					} else if ('all' === type) {
-						var status = btn.data('status');
-						bulkSnippetGithub(status);
-					} else if ('bulk' === type) {
-						checkBulkSnippetGithub();
-					} else if ('get' === type) {
-						var path = btn.data('path');
-						var status = btn.data('status');
-						setSnippetGithub(path, status);
-					} else {
-						var path = btn.data('path');
-						getSnippetModal(path, type);
-					}
-				});
-			});
-			
-			// load every thing once ready
-			jQuery(document).ajaxStop(function () {
-				if (0 === jQuery.active) {
-					//do something special
-					if ('snippets' === ajaxcall) {
-						setTimeout( function() {
-							jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
-							jQuery('#snippets-display').show();
-							jQuery('#snippets-grid').trigger('display.uk.check');
-							jQuery('#loading').hide();
-						}, 1000);
-					} 
-				}
-			});
-			
-			// get the libraries
-			function getLibraries(path) {
-				var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
-				// always hide the snippets display
-				jQuery('#snippets-display').hide();
-				// always reset the grid
-				jQuery('#libraries-grid').html('');
-				// set the ajax scope
-				ajaxcall = 'libraries';
-				if (_paths) {
-					buildLibraries(_paths);
-				} else {
-					jQuery.get(path)
-					.success(function(paths) {
-						// load only this library paths
-						jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
-						buildLibraries(paths);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						jQuery('#snippets-github').html(returnError);
-					});
-				}
-			}
-			
-			// build the ibraries object
-			function buildLibraries(paths) {
-				var _temp = jQuery.jStorage.get('JCB-Libraries', null);
-				if (_temp) {
-					setLibraries(_temp);
-				} else {
-					var temp = {};
-					jQuery.each(paths.tree, function(key,value) {
-						if (value.path.match(\".json$\")) {
-							var libName = value.path.split(/ -(.+)/)[0];
-							libName = libName.trim()
-							temp[libName] = libName;
-						}
-					});
-					// load only this library paths
-					jQuery.jStorage.set('JCB-Libraries', temp, {TTL: expire});
-					setLibraries(temp);
-				}
-			}
-			
-			// set the libraries
-			function setLibraries(names) {
-				// now load the lib buttons
-				jQuery.each(names, function(value) {
-					setLibrary(value);
-				});
-				setTimeout( function() {
-					jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES')+'</h1>');
-					jQuery('#libraries-display').show();
-					jQuery('#libraries-grid').trigger('display.uk.check');
-				}, 1000);
-			}
-			
-			// set the snippets
-			function setLibrary(name) {
-				// get useful ID
-				var keyID = getKeyID(name);
-				// build the library display
-				var html = '<div id=\"'+keyID+'-panel\" class=\"uk-panel\">';
-				html += '<div class=\"uk-panel uk-panel-box uk-width-1-1\">';
-				html += '<h3 class=\"uk-panel-title\">' + name + '</h3>';
-				html += '<hr />';
-				// set the data buttons
-				html += setLibButtons(name);
-				// close the box panel
-				html += '</div>';
-				html += '</div>';
-				// now we have the library
-				jQuery('#libraries-grid').append(html);
-			}
-			
-			function setLibButtons(name) {
-				return  '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-1 getreaction\" data-name=\"'+name+'\" data-type=\"getSnippets\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'\"><i class=\"uk-icon-thumb-tack\"></i><span class=\"uk-hidden-small\"> '+Joomla.JText._('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS')+'</span></button>';
-			}
-			
-			// get the snippets
-			function getSnippets(path, libraryName) {
-				jQuery('#loading').show();
-				// get local values if set
-				var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
-				// always reset the grid
-				jQuery('#snippets-grid').html('');
-				// always hide libraries
-				jQuery('#libraries-display').hide();
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				fromLocal = false;
-				if (_paths) {
-					setSnippets(_paths, libraryName);
-					jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
-				} else {
-					jQuery.get(path)
-					.success(function(paths) {
-						// load only this library paths
-						jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
-						setSnippets(paths, libraryName);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						jQuery('#snippets-github').html(returnError);
-					});
-				}
-				// only use if loading localy
-				if (fromLocal) {
-					jQuery('#snippets-display').show();
-					jQuery('#snippets-grid').trigger('display.uk.check');
-					jQuery('#loading').hide();
-				}
-			}
-			
-			// set the snippets
-			function setSnippets(paths, libraryName) {
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				jQuery.each(paths.tree, function(key,value) {
-					if (value.path.match(\".json$\") && value.path.match(\"^\"+libraryName)) {
-						var _snippet = jQuery.jStorage.get(value.path, null);
-						if (_snippet) {
-							setSnippet(_snippet, value.path);
-							fromLocal = true;
-						} else {
-							jQuery.get(snippetPath+value.path)
-							.success(function(snippet) {
-								// convert the string to json.object
-								snippet = jQuery.parseJSON(snippet);
-								jQuery.jStorage.set(value.path, snippet, {TTL: expire});
-								setSnippet(snippet, value.path);
-							})
-							.error(function(jqXHR, textStatus, errorThrown) { 
-								// we could do more
-							});
-						}
-					}
-				});
-			}
-			
-			// set the snippets
-			function setSnippet(snippet, key) {
-				// get useful ID
-				var keyID = getKeyID(key);
-				// get the status
-				var status = getSnippetStatus(snippet, key);
-				// add to bulk updater
-				if ('equal' !== status) {
-					bulkItems[status].push(key);
-				}
-				// build the snippet display
-				var html = '<div id=\"'+keyID+'-panel\" class=\"uk-panel\" data-uk-filter=\"'+status+'\" data-snippet-libraries=\"'+snippet.library+'\" data-snippet-types=\"'+snippet.type+'\" data-snippet-name=\"'+snippet.name+'\">';
-				html += '<div class=\"uk-panel uk-panel-box uk-width-1-1\">';
-				html += '<div class=\"uk-panel-badge uk-badge\" ><a id=\"'+keyID+'-badge\" href=\"#'+status+'-meaning\" data-uk-offcanvas class=\"uk-text-uppercase uk-text-contrast\"><i class=\"uk-icon-info\"></i> '+status+'</a></div><br />';
-				html += '<h3 class=\"uk-panel-title\">' + snippet.library+ ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
-				html += snippet.heading + '<hr />';
-				// set the data buttons
-				html += setDataButtons(snippet, key, status);
-				// set the snippet ref button
-				html += setRefButtons(snippet, key, status, keyID);
-				// set the contributor buttons
-				html += setContributorButtons(snippet, key);
-				// close the box panel
-				html += '</div>';
-				html += '</div>';
-				// now we have the snippet
-				jQuery('#snippets-grid').append(html);
-			}
-			
-			// set the snippet status
-			function getSnippetStatus(snippet, key) {
-				// check if JCB already has this snippet
-				if(local_snippets.hasOwnProperty(key)){
-					// first get local time stamp
-					var local_created = strtotime(local_snippets[key].created);
-					var local_modified = strtotime(local_snippets[key].modified);
-					// now get github time stamps					
-					var created = strtotime(snippet.created);
-					var modified = strtotime(snippet.modified);
-					// work out the status
-					if (local_created == created) {
-						if (local_modified == modified) {
-							return 'equal';
-						} else if (local_modified > modified) {
-							return 'ahead';
-						} else if (local_modified < modified) {
-							return 'behind';
-						}
-					}
-					return 'diverged';
-				}
-				return 'new';
-			}
-			
-			function setDataButtons(snippet, key, status) {
-				var html = '<div class=\"uk-button-group uk-width-1-1 uk-margin-small-bottom\">';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"usage\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_USAGE_OF_COMMUNITY_VERSION')+'\"><i class=\"uk-icon-info\"></i><span class=\"uk-hidden-small\"> '+Joomla.JText._('COM_COMPONENTBUILDER_USAGE')+'</span></button>';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"description\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'\"><i class=\"uk-icon-sticky-note-o\"></i><span class=\"uk-hidden-small\"> '+Joomla.JText._('COM_COMPONENTBUILDER_DESCRIPTION')+'</span></button>';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"snippet\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION')+'\"><i class=\"uk-icon-code\"></i><span class=\"uk-hidden-small\"> '+Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET')+'</span></button>';
-				html += '</div>';
-				// return data buttons
-				return html;
-			}
-			
-			function setRefButtons(snippet, key, status, keyID) {
-				var html = '<div><a class=\"uk-button uk-button-mini uk-button-success uk-margin-small-bottom uk-width-1-1\" href=\"'+snippet.url+'\" target=\"_blank\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_REFERENCE_URL')+'\"><i class=\"uk-icon-external-link\"></i> ' + snippet.name + '</a></div>';
-				// set the update button	
-				html += '<div>';
-				if ('equal' !== status) {
-					if ('new' === status) {
-						var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY');
-					} else {
-						var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION');
-					}
-					html += '<button id=\"'+keyID+'-getbutton\" class=\"uk-button uk-button-small uk-button-primary uk-width-1-1 uk-margin-small-bottom getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"get\"  title=\"'+tooltip+'\"><i class=\"uk-icon-cloud-download\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_GET_SNIPPET')+'</button>';
-				} else {
-					html += '<button class=\"uk-button uk-button-small uk-width-1-1 uk-margin-small-bottom\" type=\"button\" disabled title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION')+'\"><i class=\"uk-icon-check-square-o\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET')+'</button>';
-				}
-				html += '</div>';
-				// return data buttons
-				return html;
-			}
-			
-			function setContributorButtons(snippet, key) {
-				// set the contributor name
-				if (snippet.contributor_company) {
-					var contributor_name = snippet.contributor_company;
-				} else if (snippet.contributor_name) {
-					var contributor_name = snippet.contributor_name;
-				} else {
-					var contributor_name = Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY');
-				}
-				// set the contributor url
-				if (snippet.contributor_website) {
-					var contributor_url = snippet.contributor_website;
-				} else if (snippet.contributor_email) {
-					var contributor_url = 'mailto:'+snippet.contributor_email;
-				} else {
-					var contributor_url = 'https://github.com/vdm-io/Joomla-Component-Builder-Snippets';
-				}
-				var html = '<div class=\"uk-button-group uk-width-1-1\">';
-				html += '<button class=\"uk-button uk-button-primary uk-width-1-10 uk-button-mini getreaction\" data-type=\"contributor\" data-path=\"'+key+'\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_THE_CONTRIBUTOR_DETAILS')+'\"><i class=\"uk-icon-user\"></i></button>';
-				html += '<a  class=\"uk-button uk-button-primary uk-width-5-10 uk-button-mini\" href=\"'+contributor_url+'\" target=\"_blank\"  title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR')+'\"><i class=\"uk-icon-external-link\"></i> ' + contributor_name + '</a>';
-				html += '<a class=\"uk-button uk-button-primary uk-width-4-10 uk-button-mini\" href=\"https://github.com/vdm-io/Joomla-Component-Builder-Snippets/blame/master/'+key+'\" target=\"_blank\" title=\"'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_WHO_CONTRIBUTED_TO_THIS_SNIPPET')+'\"><i class=\"uk-icon-external-link\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_BLAME')+'</a>';
-				html += '</div>';
-				// return contributor buttons
-				return html;
-			}
-			
-			// do a bulk update
-			function checkBulkSnippetGithub() {
-				// check if there is new items
-				if (bulkItems.new.length === 0) {
-					jQuery('#bulk-button-new').prop('disabled', true);
-					jQuery('#bulk-button-new').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME'));
-					jQuery('#bulk-notice-new').show();
-				}
-				// check if there is diverged items
-				if (bulkItems.diverged.length === 0) {
-					jQuery('#bulk-button-diverged').prop('disabled', true);
-					jQuery('#bulk-button-diverged').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME'));
-					jQuery('#bulk-notice-diverged').show();
-				}
-				// check if there is ahead items
-				if (bulkItems.ahead.length === 0) {
-					jQuery('#bulk-button-ahead').prop('disabled', true);
-					jQuery('#bulk-button-ahead').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME'));
-					jQuery('#bulk-notice-ahead').show();
-				}
-				// check if there is behind items
-				if (bulkItems.behind.length === 0) {
-					jQuery('#bulk-button-behind').prop('disabled', true);
-					jQuery('#bulk-button-behind').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME'));
-					jQuery('#bulk-notice-behind').show();
-				}
-				// check if all we should close the all button
-				if (bulkItems.behind.length === 0 && bulkItems.new.length === 0 && bulkItems.ahead.length === 0 && bulkItems.diverged.length === 0) {
-					jQuery('#bulk-button-all').prop('disabled', true);
-					jQuery('#bulk-button-all').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME'));
-					jQuery('#bulk-notice-all').show();
-				}
-			}
-			
-			// do a bulk update
-			function bulkSnippetGithub(status) {
-				// if all then trigger those with values
-				if ('all' === status) {
-					bulkSnippetGithub('behind');
-					bulkSnippetGithub('new');
-					bulkSnippetGithub('ahead');
-					bulkSnippetGithub('diverged');
-				} else if (bulkItems[status].length > 0) {
-					jQuery.each(bulkItems[status], function(i, key){
-						setTimeout(function(){
-							doBulkUpdate_server(key, status).done(function(result) {
-								if (result.message) {
-									// only show errors
-									if ('error' === result.status || 'warning' === result.status) {
-										UIkit.notify(result.message, {status: result.status});
-									}
-									// update local items
-									if ('success' === result.status) {
-										// get key ID
-										var keyID = getKeyID(key);
-										// update snippet if we can
-										updateSnippetDisplay(keyID, 'equal');
-									}
-								} else {
-									UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
-								}
-							});
-						}, 200);
-					});
-					// reset array
-					bulkItems[status].length = 0;
-					// update the buttons (since we only do the bulk update once)
-					checkBulkSnippetGithub();
-				}
-			}
-			
-			function doBulkUpdate_server(path, status) {
-				// set the ajax scope
-				ajaxcall = null;
-				var getUrl = \"index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json\";
-				if (token.length > 0 && path.length > 0 && status.length > 0) {
-					var request = 'token='+token+'&path='+path+'&status='+status;
-				}
-				return jQuery.ajax({
-					type: 'POST',
-					url: getUrl,
-					dataType: 'jsonp',
-					data: request,
-					jsonp: 'callback'
-				});
-			}
-			
-			// set the snippet from gitHub
-			function setSnippetGithub(key, status) {
-				var message = getConfirmUpdate(status);
-				UIkit.modal.confirm(message, function(){
-					// will be executed on confirm.
-					setSnippetGithub_server(key, status).done(function(result) {
-						if (result.message) {
-							UIkit.notify(result.message, {status: result.status});
-							if ('success' === result.status) {
-								// get key ID
-								var keyID = getKeyID(key);
-								// update snippet if we can
-								updateSnippetDisplay(keyID, 'equal');
-							}
-						} else {
-							UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
-						}
-					});
-				});
-			}
-			
-			function setSnippetGithub_server(path, status) {
-				// set the ajax scope
-				ajaxcall = null;
-				var getUrl = \"index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json\";
-				if (token.length > 0 && path.length > 0 && status.length > 0) {
-					var request = 'token='+token+'&path='+path+'&status='+status;
-				}
-				return jQuery.ajax({
-					type: 'POST',
-					url: getUrl,
-					dataType: 'jsonp',
-					data: request,
-					jsonp: 'callback'
-				});
-			}
-			
-			// update the snippet display
-			function updateSnippetDisplay(keyID, status) {
-				// update badge
-				jQuery('#'+keyID+'-badge').html('<i class=\"uk-icon-info\"></i> ' +status);
-				jQuery('#'+keyID+'-badge').attr('href' , '#'+status+'-meaning');
-				// update button
-				if ('equal' === status) {
-					// update notice
-					jQuery('#'+keyID+'-getbutton').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION'));
-					jQuery('#'+keyID+'-getbutton').prop('disabled', true);
-					jQuery('#'+keyID+'-getbutton').html('<i class=\"uk-icon-check-square-o\"></i> ' + Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET'));
-					// counter delay just incase
-					setTimeout(function(){
-						jQuery('#'+keyID+'-getbutton').prop('disabled', true);
-					}, 2000);
-				}
-				// update the data filter
-				jQuery('#'+keyID+'-panel').attr('data-uk-filter', status);
-				// tell the grid to update
-				jQuery('#snippets-grid').trigger('display.uk.check');
-			}
-			
-			// set the modal
-			function getSnippetModal(key, type) {
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				var _snippet = jQuery.jStorage.get(key, null);
-				if (_snippet) {
-					// show modal
-					showSnippetModal(_snippet, type);
-				} else {
-					jQuery.get('https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/'+key)
-					.success(function(snippet) {
-						// convert the string to json.object
-						snippet = jQuery.parseJSON(snippet);
-						jQuery.jStorage.set(key, snippet, {TTL: expire});
-						// show modal
-						showSnippetModal(snippet, type);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						// we could do more
-					});
-				}
-			}
-			
-			// show the modal
-			function showSnippetModal(snippet, type) {
-				var html = '<div class=\"uk-modal-dialog uk-modal-dialog-lightbox\">';
-				html += '<a href=\"\" class=\"uk-modal-close uk-close uk-close-alt\"></a>';
-				html += '<h3>' + snippet.library + ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
-				if ('contributor' === type) {
-					html += '<dl class=\"uk-description-list-line\">';
-					html += '<dt><i class=\"uk-icon-institution\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_COMPANY_NAME')+'</dt>';
-					html += '<dd>'+snippet.contributor_company+'</dd>';
-					html += '<dt><i class=\"uk-icon-user\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_NAME')+'</dt>';
-					html += '<dd>'+snippet.contributor_name+'</dd>';
-					html += '<dt><i class=\"uk-icon-envelope-o\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_EMAIL')+'</dt>';
-					html += '<dd>'+snippet.contributor_email+'</dd>';
-					html += '<dt><i class=\"uk-icon-laptop\"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_WEBSITE')+'</dt>';
-					html += '<dd>'+snippet.contributor_website+'</dd>';
-					html += '</dl>';
-				} else {
-					html += '<br /><textarea class=\"uk-width-1-1\" rows=\"15\" readonly>'+snippet[type]+'</textarea>';
-				}
-				html += '<br /><small>C: ' + snippet.created + ' | M: ' + snippet.modified + '</small>';
-				html += '</div>';
-				// get current page position
-				var scroll = jQuery(window).scrollTop();
-				// add html to modal
-				var modal = UIkit.modal.blockUI(html, {center:true, bgclose:true}).on({
-					'hide.uk.modal': function(){
-						// scroll fix since the modal pops to the top of the page
-						jQuery(window).scrollTop(scroll);
-					}
-				});
-				// show modal
-				modal.show();
-			}
-			
-			// get key ID
-			function getKeyID(key) {
-				// get useful ID
-				var keyID = key.replace('-', '');
-				keyID = keyID.replace('.json', '');
-				keyID = keyID.replace(/\s+/ig, '-');
-				keyID = keyID.replace(/\(/g, '');
-				keyID = keyID.replace(/\)/g, '');
-				// return the id build
-				return keyID;
-			}
-		");
 	}
 
 	/**

admin/views/help_document/tmpl/edit.php

@@ -127,63 +127,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwam function
+// #jform_location listeners for location_vvvvwao function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
 });
 
-// #jform_location listeners for location_vvvvwan function
+// #jform_location listeners for location_vvvvwap function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
-
-});
-
-// #jform_type listeners for type_vvvvwao function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-});
-
-// #jform_type listeners for type_vvvvwap function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
 
 });
 
@@ -202,18 +172,48 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwar function
+// #jform_type listeners for type_vvvvwar function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwar = jQuery("#jform_type").val();
+	vvvvwar(type_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwar = jQuery("#jform_type").val();
+	vvvvwar(type_vvvvwar);
+
+});
+
+// #jform_type listeners for type_vvvvwas function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+});
+
+// #jform_target listeners for target_vvvvwat function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwat(target_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwat(target_vvvvwat);
 
 });
 

admin/views/help_documents/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('help_document');
 		$this->canEdit		= $this->canDo->get('help_document.edit');

admin/views/joomla_components/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('joomla_component');
 		$this->canEdit		= $this->canDo->get('joomla_component.edit');

admin/views/language_translations/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('language_translation');
 		$this->canEdit		= $this->canDo->get('language_translation.edit');

admin/views/languages/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLanguages extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('language');
 		$this->canEdit		= $this->canDo->get('language.edit');

admin/views/layout/tmpl/edit.php

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

admin/views/layouts/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('layout');
 		$this->canEdit		= $this->canDo->get('core.edit');

admin/views/libraries/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('library');
 		$this->canEdit		= $this->canDo->get('library.edit');

admin/views/libraries_config/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('library_config');
 		$this->canEdit		= $this->canDo->get('library_config.edit');

admin/views/libraries_files_folders_urls/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('library_files_folders_urls');
 		$this->canEdit		= $this->canDo->get('library_files_folders_urls.edit');

admin/views/library/tmpl/edit.php

@@ -147,36 +147,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvvzu function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-});
-
-// #jform_how listeners for how_vvvvvzv function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
-});
-
 // #jform_how listeners for how_vvvvvzw function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -252,18 +222,48 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwab function
+// #jform_how listeners for how_vvvvwab function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwab = jQuery("#jform_how").val();
+	vvvvwab(how_vvvvwab);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwab = jQuery("#jform_how").val();
+	vvvvwab(how_vvvvwab);
+
+});
+
+// #jform_how listeners for how_vvvvwac function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+});
+
+// #jform_type listeners for type_vvvvwad function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwad(type_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwad(type_vvvvwad);
 
 });
 

admin/views/site_view/tmpl/edit.php

@@ -166,153 +166,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyi function
+// #jform_add_php_view listeners for add_php_view_vvvvvyj function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyj function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyk function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyk function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyl function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyl function
+// #jform_add_php_document listeners for add_php_document_vvvvvym function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvym function
+// #jform_add_css_document listeners for add_css_document_vvvvvyn function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyn function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyo function
+jQuery('#jform_add_javascript_file').on('keyup',function()
+{
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
+{
+	e.preventDefault();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
+
+});
+
+// #jform_add_js_document listeners for add_js_document_vvvvvyp function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyo function
+// #jform_add_css listeners for add_css_vvvvvyq function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyp function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyq function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvys function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvys(add_custom_button_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvys(add_custom_button_vvvvvys);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvyr function
+// #jform_button_position listeners for button_position_vvvvvyt function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvyt(button_position_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvyt(button_position_vvvvvyt);
 
 });
 

admin/views/site_views/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('site_view');
 		$this->canEdit		= $this->canDo->get('core.edit');

admin/views/snippet_types/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('snippet_type');
 		$this->canEdit		= $this->canDo->get('snippet_type.edit');

admin/views/snippets/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('snippet');
 		$this->canEdit		= $this->canDo->get('core.edit');

admin/views/template/tmpl/edit.php

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

admin/views/templates/view.html.php

@@ -53,7 +53,6 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 		$this->user 		= JFactory::getUser();
 		$this->listOrder	= $this->escape($this->state->get('list.ordering'));
 		$this->listDirn		= $this->escape($this->state->get('list.direction'));
-		$this->saveOrder	= $this->listOrder == 'ordering';
 		// get global action permissions
 		$this->canDo		= ComponentbuilderHelper::getActions('template');
 		$this->canEdit		= $this->canDo->get('core.edit');

componentbuilder.xml

@@ -7,9 +7,9 @@
 	<authorUrl>http://vdm.bz/component-builder</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.6.6</version>
+	<version>2.6.7</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.6.6)</h1>
+		<h1>Component Builder (v.2.6.7)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -271,4 +271,21 @@
 		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.7</version>
+		<infourl title="Component Builder!">http://vdm.bz/component-builder</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3230,9 +3230,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","icon":"icon","add_php_jview":"add_php_jview","add_css_document":"add_css_document","add_php_document":"add_php_document","libraries":"libraries","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_js_document":"add_js_document","add_css":"add_css","default":"default","php_model":"php_model","add_php_view":"add_php_view","php_document":"php_document","not_required":"not_required","php_view":"php_view","custom_get":"custom_get","php_jview_display":"php_jview_display","main_get":"main_get","php_jview":"php_jview","dynamic_get":"dynamic_get","js_document":"js_document","css_document":"css_document","add_custom_button":"add_custom_button","css":"css"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","add_js_document":"add_js_document","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","libraries":"libraries","add_css":"add_css","add_php_view":"add_php_view","php_controller":"php_controller","add_php_jview":"add_php_jview","default":"default","php_model":"php_model","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_document":"php_document","php_view":"php_view","add_custom_button":"add_custom_button","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_css_document","add_php_document","add_php_jview_display","add_js_document","add_css","add_php_view","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_css_document","add_js_document","add_php_document","add_php_jview_display","add_css","add_php_view","add_php_jview","add_javascript_file","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$custom_admin_view_Inserted = $db->insertObject('#__content_types', $custom_admin_view);
@@ -3242,9 +3242,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","js_document":"js_document","libraries":"libraries","css":"css","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","css_document":"css_document","php_ajaxmethod":"php_ajaxmethod","add_php_view":"add_php_view","default":"default","add_php_jview":"add_php_jview","php_model":"php_model","php_controller":"php_controller","not_required":"not_required","add_js_document":"add_js_document","custom_get":"custom_get","add_css_document":"add_css_document","main_get":"main_get","add_css":"add_css","dynamic_get":"dynamic_get","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","php_document":"php_document","button_position":"button_position","php_view":"php_view","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","libraries":"libraries","js_document":"js_document","add_php_document":"add_php_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","javascript_file":"javascript_file","add_php_jview":"add_php_jview","php_model":"php_model","not_required":"not_required","add_javascript_file":"add_javascript_file","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","add_css_document","main_get","add_css","dynamic_get","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_javascript_file","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$site_view_Inserted = $db->insertObject('#__content_types', $site_view);
@@ -3674,9 +3674,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","icon":"icon","add_php_jview":"add_php_jview","add_css_document":"add_css_document","add_php_document":"add_php_document","libraries":"libraries","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_js_document":"add_js_document","add_css":"add_css","default":"default","php_model":"php_model","add_php_view":"add_php_view","php_document":"php_document","not_required":"not_required","php_view":"php_view","custom_get":"custom_get","php_jview_display":"php_jview_display","main_get":"main_get","php_jview":"php_jview","dynamic_get":"dynamic_get","js_document":"js_document","css_document":"css_document","add_custom_button":"add_custom_button","css":"css"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","add_js_document":"add_js_document","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","libraries":"libraries","add_css":"add_css","add_php_view":"add_php_view","php_controller":"php_controller","add_php_jview":"add_php_jview","default":"default","php_model":"php_model","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_document":"php_document","php_view":"php_view","add_custom_button":"add_custom_button","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_css_document","add_php_document","add_php_jview_display","add_js_document","add_css","add_php_view","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_css_document","add_js_document","add_php_document","add_php_jview_display","add_css","add_php_view","add_php_jview","add_javascript_file","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if custom_admin_view type is already in content_type DB.
 			$custom_admin_view_id = null;
@@ -3703,9 +3703,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","js_document":"js_document","libraries":"libraries","css":"css","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","css_document":"css_document","php_ajaxmethod":"php_ajaxmethod","add_php_view":"add_php_view","default":"default","add_php_jview":"add_php_jview","php_model":"php_model","php_controller":"php_controller","not_required":"not_required","add_js_document":"add_js_document","custom_get":"custom_get","add_css_document":"add_css_document","main_get":"main_get","add_css":"add_css","dynamic_get":"dynamic_get","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","php_document":"php_document","button_position":"button_position","php_view":"php_view","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","libraries":"libraries","js_document":"js_document","add_php_document":"add_php_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","javascript_file":"javascript_file","add_php_jview":"add_php_jview","php_model":"php_model","not_required":"not_required","add_javascript_file":"add_javascript_file","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","add_css_document","main_get","add_css","dynamic_get","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_javascript_file","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if site_view type is already in content_type DB.
 			$site_view_id = null;
@@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://vdm.bz/component-builder" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.6.6 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.6.7 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }

site/controller.php

@@ -67,7 +67,6 @@ class ComponentbuilderController extends JControllerLegacy
 				}
 				elseif (ComponentbuilderHelper::checkString($ref))
 				{
-
 					// redirect to ref
 					 $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view='.(string)$ref, false));
 				}

site/controllers/help.php

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