Added update url to update server

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) 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.13) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th January, 2018
-+ *Version*: 2.6.10
++ *Last Build*: 24th January, 2018
++ *Version*: 2.6.13
 + *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*: **179815**
-+ *Field count*: **1571**
-+ *File count*: **1152**
-+ *Folder count*: **184**
++ *Line count*: **180832**
++ *Field count*: **1577**
++ *File count*: **1161**
++ *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) 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.13) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th January, 2018
-+ *Version*: 2.6.10
++ *Last Build*: 24th January, 2018
++ *Version*: 2.6.13
 + *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*: **179815**
-+ *Field count*: **1571**
-+ *File count*: **1152**
-+ *Folder count*: **184**
++ *Line count*: **180832**
++ *Field count*: **1577**
++ *File count*: **1161**
++ *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/access.xml

@@ -261,8 +261,6 @@
 		<action name="joomla_component.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_OWN_DESC" />
 		<action name="joomla_component.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC" />
 		<action name="joomla_component.version" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC" />
-		<action name="joomla_component.export" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC" />
-		<action name="joomla_component.import" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT_DESC" />
 		<action name="joomla_component.submenu" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC" />
 		<action name="language_translation.access" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC" />
 		<action name="language_translation.batch" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC" />

admin/compiler/joomla_3/router.php

@@ -222,7 +222,7 @@ function ###Component###BuildRoute(&$query)
 
 function ###Component###ParseRoute($segments)
 {
-	$router = new ContentRouter;
+	$router = new ###Component###Router;
 
 	return $router->parse($segments);
 }

admin/controllers/ajax.json.php

@@ -48,7 +48,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('getCronPath', 'ajax');
 		$this->registerTask('tableColumns', 'ajax');
 		$this->registerTask('fieldSelectOptions', 'ajax');
-		$this->registerTask('getImportScripts', 'ajax');
+		$this->registerTask('getDynamicScripts', 'ajax');
 		$this->registerTask('getButton', 'ajax');
 		$this->registerTask('getButtonID', 'ajax');
 		$this->registerTask('getAjaxDisplay', 'ajax');
@@ -306,14 +306,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'getImportScripts':
+				case 'getDynamicScripts':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
 						if($typeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getImportScripts($typeValue);
+							$result = $this->getModel('ajax')->getDynamicScripts($typeValue);
 						}
 						else
 						{

admin/controllers/import_language_translations.php

@@ -0,0 +1,67 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		import_language_translations.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Componentbuilder Import_language_translations Controller
+ */
+class ComponentbuilderControllerImport_language_translations extends JControllerLegacy
+{
+	/**
+	 * Import an spreadsheet.
+	 *
+	 * @return  void
+	 */
+	public function import()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Import_language_translations');
+		if ($model->import())
+		{
+			$cache = JFactory::getCache('mod_menu');
+			$cache->clean();
+			// TODO: Reset the users acl here as well to kill off any missing bits
+		}
+
+		$app = JFactory::getApplication();
+		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations', false);
+		}
+		else
+		{
+			// wipe out the user state when we're going to redirect
+			$app->setUserState('com_componentbuilder.redirect_url', '');
+			$app->setUserState('com_componentbuilder.message', '');
+			$app->setUserState('com_componentbuilder.extension_message', '');
+		}
+		$this->setRedirect($redirect_url);
+	}
+}

admin/controllers/language_translations.php

@@ -99,7 +99,7 @@ class ComponentbuilderControllerLanguage_translations extends JControllerAdmin
 				$session->set('dataType_VDM_IMPORTINTO', 'language_translation');
 				// Redirect to import view.
 				$message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS');
-				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message);
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations', false), $message);
 				return;
 			}
 		}

admin/custom/dropbox.php

@@ -1,10 +1,9 @@
 <?php
-
 /*----------------------------------------------------------------------------------|  www.vdm.io  |----/
 				Vast Development Method
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.0 - 03rd November, 2016
+	@version		2.0.0 - 21st January, 2017
 	@package		Dropbox API 2
 	@subpackage		dropbox.php
 	@author			Llewellyn van der Merwe <http://www.vdm.io>
@@ -21,16 +20,15 @@ defined('_JEXEC') or die;
  */
 class Dropbox
 {
-
 	/**
 	 * final url
 	 */
 	protected $url;
-
+	
 	/**
 	 * The array for the post url
 	 */
-	protected $postUrl = array(
+	protected $postUrl = array( 
 		"protocol" => "https://",
 		"suddomain" => "api.",
 		"domain" => "dropboxapi.com",
@@ -39,69 +37,75 @@ class Dropbox
 
 	/**
 	 * the verious pathes we need
-	 */
-	protected $domainpath = array(
+	 */	
+	protected $domainpath = array( 
+		"list_shared_links" => "sharing/list_shared_links",
 		"list_folder" => "files/list_folder",
 		"list_folder_continue" => "files/list_folder/continue",
-		"create_shared_link" => "sharing/create_shared_link",
+		"create_shared_link_with_settings" => "sharing/create_shared_link_with_settings",
 		"get_shared_link_metadata" => "sharing/get_shared_link_metadata",
 		"revoke" => "auth/token/revoke"
 	);
 
 	/**
 	 * the target pathe to get
-	 */
+	 */	
 	protected $targetPath = false;
 	protected $targetPathOriginal = false;
 
 	/**
 	 * oauth token
-	 */
+	 */	
 	protected $oauthToken;
 
 	/**
 	 * the verious pathes we need
-	 */
+	 */	
 	protected $permissionType;
 
 	/**
-	 * The loop controller in calling Dropbox API
-	 */
-	protected $continueCalling = array();
+	 * The array of queries for creating shared links
+	 */	
+	protected $createSharedLinks = array();
+
+	/**
+	 * The array of queries for getting shared links
+	 */	
+	protected $getSharedLinks = array();
 
 	/**
 	 * the success switch
-	 */
+	 */	
 	protected $succes;
 
 	/**
 	 * the type call
-	 */
+	 */	
 	protected $type;
 
 	/**
 	 * the query for the call
-	 */
+	 */	
 	protected $query;
 
 	/**
 	 * the query for the call
-	 */
+	 */	
 	protected $model;
 
 	/**
 	 * the mediaData bucket
-	 */
+	 */	
 	public $mediaData = array();
 
 	/**
 	 * the error messages
-	 */
+	 */	
 	public $error_summary = array();
-
+	
 	/**
-	 * 	force the update to reset
-	 * */
+	* 	force the update to reset
+	**/
 	public $forceReset = false;
 
 	/**
@@ -109,8 +113,12 @@ class Dropbox
 	 */
 	public function __construct(JModelLegacy $model, $buildType)
 	{
+		// set the first call
+		$this->firstCall = 'get'; // TODO (we may what to make this dynamic)
+		// set the second call
+		$this->secondCall = 'create'; // TODO (we may what to make this dynamic)
 		// set the url at this point for now
-		$this->url = $this->postUrl["protocol"] . $this->postUrl["suddomain"] . $this->postUrl["domain"] . $this->postUrl["path"];
+		$this->url = $this->postUrl["protocol"].$this->postUrl["suddomain"].$this->postUrl["domain"].$this->postUrl["path"];
 		// set the local model
 		$this->model = $model;
 		// set the build type
@@ -135,10 +143,10 @@ class Dropbox
 		ini_set('max_execution_time', 500);
 		// set the oauth toke
 		$this->oauthToken = $token;
-
+		
 		// set the permission type
 		$this->permissionType = $permissiontype;
-
+		
 		// set the details
 		if ($this->checkArray($details))
 		{
@@ -147,22 +155,125 @@ class Dropbox
 				$this->$detail = $value;
 			}
 		}
-
+		
 		// set the curent folder path
 		if (!$this->setFolderPath())
 		{
 			return false;
 		}
-
 		// start the main factory that calles for the folder data
 		$this->query = array("path" => $this->targetPath, "recursive" => true, "include_media_info" => true);
 		$this->type = 'list_folder';
 		if ($this->makeCall())
 		{
+			if ($this->_isCurl())
+			{
+				// run the share link builder
+				return $this->makeMultiExecCalls();
+			}
 			return true;
 		}
+		return false;
 	}
-
+	
+	protected function makeMultiExecCalls()
+	{
+		// make the fist call
+		$this->multiSharedLinks($this->firstCall);
+		// make the second call
+		$this->multiSharedLinks($this->secondCall);
+		// make the fist call (again for safety)
+		$this->multiSharedLinks($this->firstCall);
+		// make the second call (again for safety)
+		$this->multiSharedLinks($this->secondCall);
+	}
+	
+	protected function multiSharedLinks($type)
+	{
+		switch ($type)
+		{
+			case "create":
+				// great links if not made already
+				if (count($this->createSharedLinks) > 0)
+				{
+					$url = $this->url.$this->domainpath['create_shared_link_with_settings'];
+					$this->type = 'create_shared_link_with_settings';
+					// build return function
+					$storeSharedLink = function ($data, $target) {
+						// check if link already made
+						if (isset($data->error_summary) && strpos($data->error_summary, 'shared_link_already_exists') !== false)
+						{
+							$this->getSharedLinks[] = json_encode(array("path" => $target));
+						}
+						else
+						{
+							$this->curlCallResult($data);
+						}
+					};
+					// run call
+					return $this->multiCall($url, $type, $storeSharedLink);
+				}
+			break;
+			case "get":
+				// now get the already made links
+				if (count($this->getSharedLinks) > 0)
+				{
+					$url = $this->url.$this->domainpath['list_shared_links'];
+					$this->type = 'list_shared_links';
+					// build return function
+					$storeSharedLink = function ($data, $target) {
+						// check if link not made
+						if (isset($data->error_summary))
+						{
+							$this->createSharedLinks[] = json_encode(array("path" => $target, "settings" => array("requested_visibility" => "public")));
+						}
+						else
+						{
+							$this->curlCallResult($data);
+						}
+					};
+					// run call
+					return $this->multiCall($url, $type, $storeSharedLink);
+				}
+			break;
+		}
+		return false;
+	}
+	
+	protected function multiCall(&$url, $type, &$storeSharedLink)
+	{
+		$timer = 1;
+		$options = array();
+		// set the options array and make the calls every 250
+		foreach ($this->{$type."SharedLinks"} as $query)
+		{
+			$options[] = array(CURLOPT_HTTPHEADER => array('Authorization: Bearer ' . $this->oauthToken, 'Content-Type: application/json'), CURLOPT_POST => 1,  CURLOPT_POSTFIELDS => $query); $timer++;
+			// check timer
+			if ($timer >= 550)
+			{
+				// run multi curl
+				$this->curlMultiExec($url, $options, $storeSharedLink);
+				// reset
+				$timer = 1;
+				$options = array();
+			}
+		}
+		// make sure all was done
+		if ($timer > 1 && count($options))
+		{
+			// run multi curl
+			$this->curlMultiExec($url, $options, $storeSharedLink);
+		}
+		// reset the values
+		$this->{$type."SharedLinks"} = array();
+		// only if there is no errors
+		if (count($this->error_summary) > 0)
+		{
+			return false;
+		}
+		return true;
+	}
+	
 	public function revokeToken($token = null)
 	{
 		if ($token)
@@ -179,7 +290,7 @@ class Dropbox
 		}
 		return false;
 	}
-
+	
 	protected function setFolderPath()
 	{
 		if ('full' == $this->permissionType && isset($this->dropboxOption) && isset($this->dropboxTarget) && $this->checkString($this->dropboxTarget))
@@ -187,8 +298,8 @@ class Dropbox
 			if (2 == $this->dropboxOption)
 			{
 				// simply set the path
-				$this->targetPath = '/' . trim(strtolower($this->dropboxTarget), '/');
-
+				$this->targetPath = '/'.trim(strtolower($this->dropboxTarget), '/');
+				
 				return true;
 			}
 			elseif (1 == $this->dropboxOption)
@@ -205,12 +316,12 @@ class Dropbox
 		elseif ('app' == $this->permissionType)
 		{
 			$this->targetPath = "";
-
+			
 			return true;
 		}
 		return false;
 	}
-
+	
 	protected function makeCall()
 	{
 		if ($this->_isCurl())
@@ -222,48 +333,52 @@ class Dropbox
 			return $this->makeGetCall();
 		}
 	}
-
+	
 	protected function makeGetCall()
-	{
+	{		
 		$options = array(
 			'http' => array(
-				'header' => "Content-Type: application/json\r\n" .
-				"Authorization: Bearer " . $this->oauthToken,
-				'method' => "POST"
+				'header' => "Content-Type: application/json\r\n".
+					"Authorization: Bearer ".$this->oauthToken,
+				'method'  => "POST"
 			),
 		);
-
+		
 		if ($this->checkArray($this->query))
 		{
 			$this->query = json_encode($this->query);
 		}
-		$options['http']['content'] = $this->query;
-
+		// add the query
+		if ($this->checkString($this->query))
+		{
+			$options['http']['content'] = $this->query;
+		}
 		$context = stream_context_create($options);
-		$response = file_get_contents($this->url . $this->domainpath[$this->type], false, $context);
+		$response = file_get_contents($this->url.$this->domainpath[$this->type], false, $context);
 
 		// store the result
 		return $this->getCallResult($response);
 	}
-
+	
 	protected function getCallResult($response)
 	{
 		if ($response === FALSE)
 		{
-			$this->error_summary[] = $this->type . '_error';
+			$this->error_summary[] = $this->type.'_error';
 			return false;
 		}
 		// store the result
 		return $this->setTheResult(json_decode($response));
 	}
-
+	
 	protected function makeCurlCall()
 	{
-		$headers = array('Authorization: Bearer ' . $this->oauthToken,
-			'Content-Type: application/json'
-		);
+		// do not run creat shared link this way
+		$headers = array('Authorization: Bearer '. $this->oauthToken,
+				'Content-Type: application/json'
+			);
 
-		$ch = curl_init($this->url . $this->domainpath[$this->type]);
+		$ch = curl_init($this->url.$this->domainpath[$this->type]);
 
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 		// check if query is set		
@@ -271,7 +386,11 @@ class Dropbox
 		{
 			$this->query = json_encode($this->query);
 		}
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
+		// add the query
+		if ($this->checkString($this->query))
+		{
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
+		}
 		curl_setopt($ch, CURLOPT_POST, true);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		// curl_setopt($ch, CURLOPT_VERBOSE, 1); // debug
@@ -283,9 +402,9 @@ class Dropbox
 		// store the result
 		return $this->curlCallResult($response);
 	}
-
+	
 	public function curlCallResult($response)
-	{
+	{		
 		if ($this->checkJson($response))
 		{
 			$response = json_decode($response);
@@ -293,7 +412,7 @@ class Dropbox
 		// store the result
 		return $this->setTheResult($response);
 	}
-
+	
 	protected function setTheResult($data)
 	{
 		// if there was an error stop!!!
@@ -303,11 +422,11 @@ class Dropbox
 			$this->forceReset = true;
 			return false;
 		}
-
+		
 		// deal with each type
 		switch ($this->type)
 		{
-			case "list_folder":
+			case "list_folder":			
 			case "list_folder_continue":
 				if (isset($data->entries) && $this->checkArray($data->entries))
 				{
@@ -327,15 +446,30 @@ class Dropbox
 						return true;
 					}
 				}
-				$this->error_summary[] = $this->type . '_error';
+				$this->error_summary[] = $this->type.'_error';
 				break;
-			case "create_shared_link":
-				if (isset($data->url) && isset($data->path) && $this->storeSharedLink($this->fixPath($data->path), str_replace('?dl=0', '?dl=1', $data->url)))
+			case "list_shared_links":
+				if (isset($data->links) && $this->checkArray($data->links))
+				{
+					foreach ($data->links as $link)
+					{
+						if (!$this->storeSharedLink($link))
+						{
+							// we could not stored the link
+							return false;
+						}
+					}
+					return true;
+				}
+				$this->error_summary[] = $this->type.'_error';
+				break;
+			case "create_shared_link_with_settings":
+				if ($this->storeSharedLink($data))
 				{
 					// we stored the link
 					return true;
 				}
-				$this->error_summary[] = $this->type . '_error';
+				$this->error_summary[] = $this->type.'_error';
 				break;
 			case "get_shared_link_metadata":
 				if (isset($data->path_lower))
@@ -343,37 +477,36 @@ class Dropbox
 					$this->targetPath = $data->path_lower;
 					return true;
 				}
-				$this->error_summary[] = $this->type . '_error';
+				$this->error_summary[]	= $this->type.'_error';
 				break;
 			case "revoke":
 				if (is_null($data))
 				{
 					return true;
 				}
-				$this->error_summary[] = $this->type . '_error';
+				$this->error_summary[] = $this->type.'_error';
 				break;
 		}
 		$this->forceReset = true;
 		return false;
 	}
-
-	protected function storeSharedLink($path, $url)
+	
+	protected function storeSharedLink($data)
 	{
 		// we need to store the url to DB
-		if (isset($this->mediaData[$path]))
+		if (isset($data->url) && isset($data->name) && isset($data->size) && (isset($data->path) || isset($data->path_lower)))
 		{
-			$localListing = array();
-			$localListing['id'] = 0;
-			$localListing['name'] = $this->mediaData[$path]['name'];
-			$localListing['size'] = $this->mediaData[$path]['size'];
-			$localListing['key'] = $path;
-			$localListing['url'] = $url;
-			$localListing['build'] = $this->build;
-			$localListing['external_source'] = (int) $this->sourceID;
-			// free some memory
-			unset($this->mediaData[$path]);
+			$path								= (isset($data->path)) ? $data->path : $data->path_lower;
+			$localListing						= array();
+			$localListing['id']					= 0;
+			$localListing['name']				= $data->name;
+			$localListing['size']				= $data->size;
+			$localListing['key']				= $this->fixPath($path);
+			$localListing['url']				= str_replace('?dl=0','?dl=1',$data->url);
+			$localListing['build']				= $this->build;
+			$localListing['external_source']	= (int) $this->sourceID;
 			// check if item already set
-			if ($id = $this->model->searchForId($path))
+			if ($id = $this->model->searchForId($localListing['key']))
 			{
 				// update item
 				$localListing['id'] = $id;
@@ -384,9 +517,9 @@ class Dropbox
 	}
 
 	protected function storeFiles($entries)
-	{
+	{		
 		foreach ($entries as $item)
-		{
+		{			
 			if (isset($item->{'.tag'}) && 'file' == $item->{'.tag'} && isset($item->name))
 			{
 				$addLink = false;
@@ -395,7 +528,7 @@ class Dropbox
 				{
 					foreach ($this->addTypes as $add)
 					{
-						if (strpos($item->name, $add) !== false)
+						if (strpos($item->name,$add) !== false)
 						{
 							$addLink = true;
 						}
@@ -403,12 +536,28 @@ class Dropbox
 				}
 				if ($addLink && isset($item->path_lower))
 				{
-					// store media info
-					$this->mediaData[$this->fixPath($item->path_lower)] = array('name' => $item->name, 'size' => $item->size);
-					// get the shared link
-					$this->query = array("path" => $item->path_lower);
-					$this->type = 'create_shared_link';
-					if (!$this->makeCall())
+					// set based on first call
+					if ('get' === $this->firstCall)
+					{
+						// first check if shared link exist
+						$this->query = array("path" => $item->path_lower);
+						// set the type of call
+						$this->type = 'list_shared_links';
+					}
+					else
+					{
+						// first check if shared link exist
+						$this->query = array("path" => $item->path_lower, "settings" => array("requested_visibility" => "public"));
+						// set the type of call
+						$this->type = 'create_shared_link_with_settings';
+					}
+					// if we have curl the use multi curl execution
+					if ($this->_isCurl())
+					{
+						// set query to worker
+						$this->{$this->firstCall."SharedLinks"}[] = json_encode($this->query);
+					}
+					elseif (!$this->makeCall())
 					{
 						return false;
 					}
@@ -417,7 +566,7 @@ class Dropbox
 		}
 		return true;
 	}
-
+	
 	protected function fixPath($path)
 	{
 		if ($this->checkString($this->targetPath))
@@ -426,7 +575,7 @@ class Dropbox
 		}
 		else
 		{
-			$path = 'VDM_pLeK_h0uEr' . $path;
+			$path = 'VDM_pLeK_h0uEr'.$path;
 		}
 		return $path;
 	}
@@ -448,7 +597,7 @@ class Dropbox
 		}
 		return false;
 	}
-
+	
 	protected function checkJson($string)
 	{
 		if ($this->checkString($string))
@@ -467,9 +616,85 @@ class Dropbox
 		}
 		return false;
 	}
-
+	
 	protected function _isCurl()
 	{
 		return function_exists('curl_version');
 	}
+	
+	protected function curlMultiExec(&$url, &$_options, $callback = null)
+	{
+		if ($this->checkString($url))
+		{
+			// make sure the thread size isn't greater than the # of _options
+			$threadSize = 20;
+			$threadSize = (sizeof($_options) < $threadSize) ? sizeof($_options) : $threadSize;
+			// set the options
+			$options = array();
+			$options[CURLOPT_URL] = $url;
+			$options[CURLOPT_USERAGENT] = 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12';
+			$options[CURLOPT_RETURNTRANSFER] = TRUE;
+			$options[CURLOPT_SSL_VERIFYPEER] = FALSE;
+			// start multi threading :)
+			$handle = curl_multi_init();
+			// start the first batch of requests
+			for ($i = 0; $i < $threadSize; $i++)
+			{
+				if (isset($_options[$i]))
+				{
+					$ch = curl_init();
+					foreach ($_options[$i] as $curlopt => $string)
+					{
+						$options[$curlopt] = $string;
+					}
+					curl_setopt_array($ch, $options);
+					curl_multi_add_handle($handle, $ch);
+				}
+			}
+			// we wait for all the calls to finish (should not take long)
+			do {
+				while(($execrun = curl_multi_exec($handle, $working)) == CURLM_CALL_MULTI_PERFORM);
+					if($execrun != CURLM_OK)
+						break;
+				// a request was just completed -- find out which one
+				while($done = curl_multi_info_read($handle))
+				{
+					if (is_callable($callback))
+					{
+						// $info = curl_getinfo($done['handle']);
+						// request successful. process output using the callback function.
+						$output = curl_multi_getcontent($done['handle']);
+						$callback(json_decode($output), json_decode(end($_options[$i]))->path);
+					}
+					$key = $i + 1;
+					if(isset($_options[$key]))
+					{
+						// start a new request (it's important to do this before removing the old one)
+						$ch = curl_init(); $i++;
+						// add options
+						foreach ($_options[$key] as $curlopt => $string)
+						{
+							$options[$curlopt] = $string;
+						}
+						curl_setopt_array($ch, $options);
+						curl_multi_add_handle($handle, $ch);
+						// remove options again
+						foreach ($_options[$key] as $curlopt => $string)
+						{
+							unset($options[$curlopt]);
+						}
+					}
+					// remove the curl handle that just completed
+					curl_multi_remove_handle($handle, $done['handle']);
+				}
+				// stop wasting CPU cycles and rest for a couple ms
+				usleep(10000);
+			} while ($working);
+			// close the curl multi thread
+			curl_multi_close($handle);
+			// okay done
+			return true;
+		}
+		return false;
+	}
 }

admin/custom/dropboxupdater.php

@@ -405,7 +405,7 @@ class Dropboxupdater
 		{
 			$this->setErrors($this->dropbox->error_summary);
 			return false;
-		}		
+		}
 		// if this is a manual update, then revoke the token
 		if ($this->forceUpdate)
 		{

admin/helpers/compiler.php

@@ -65,7 +65,7 @@ class Compiler extends Infusion
 	{
 		// to check the compiler speed
 		$this->time_start = microtime(true);
-		// first we run the perent constructor
+		// first we run the perent constructors
 		if (parent::__construct($config))
 		{
 			// set temp directory

admin/helpers/compiler/a_Get.php

@@ -1534,7 +1534,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import_ext', 'php_import_display', 'php_import', 'php_import_setdata', 'php_import_save', 'html_import_view');
+				$addImportArray = array('php_import_ext', 'php_import_display', 'php_import', 'php_import_setdata', 'php_import_save', 'php_import_headers', 'html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
@@ -1545,7 +1545,7 @@ class Get
 					else
 					{
 						// load the default
-						$this->customScriptBuilder[$importScripter]['import_' . $name_list] = ComponentbuilderHelper::getImportScripts($importScripter, true);
+						$this->customScriptBuilder[$importScripter]['import_' . $name_list] = ComponentbuilderHelper::getDynamicScripts($importScripter, true);
 					}
 				}
 			}

admin/helpers/compiler/c_Fields.php

@@ -375,33 +375,19 @@ class Fields extends Structure
 	/**
 	 * set the Field set of a view
 	 * 
-	 * @param   array    $view  The view data
-	 * @param   string   $component The component name
+	 * @param   array    $view             The view data
+	 * @param   string   $component        The component name
+	 * @param   string   $viewName         The single view name
+	 * @param   string   $listViewName     The list view name
 	 *
 	 * @return  string The fields set in xml
 	 * 
 	 */
-	public function setFieldSet($view, $component)
+	public function setFieldSet($view, $component, $viewName, $listViewName)
 	{
 		// setup the fieldset of this view
 		if (isset($view['settings']->fields) && ComponentbuilderHelper::checkArray($view['settings']->fields))
 		{
-			// setup the list view and single view name
-			$listViewName = ComponentbuilderHelper::safeString($view['settings']->name_list);
-			$viewName = ComponentbuilderHelper::safeString($view['settings']->name_single);
-			// set some place holder for this view
-			$this->placeholders['###view###'] = $viewName;
-			$this->placeholders['###VIEW###'] = strtoupper($viewName);
-			$this->placeholders['###View###'] = ucfirst($viewName);
-			$this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
-			$this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
-			$this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];
-			$this->placeholders['###views###'] = $listViewName;
-			$this->placeholders['###VIEWS###'] = strtoupper($listViewName);
-			$this->placeholders['###Views###'] = ucfirst($listViewName);
-			$this->placeholders['[[[views]]]'] = $this->placeholders['###views###'];
-			$this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###'];
-			$this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###'];
 			// add metadata to the view
 			if (isset($view['metadata']) && $view['metadata'])
 			{
@@ -753,8 +739,6 @@ class Fields extends Structure
 				// count the static field created
 				$this->fieldCount++;
 			}
-			// just to be safe, lets clear the view placeholders
-			$this->clearFromPlaceHolders('view');
 			// return the set
 			return $this->xmlPrettyPrint($XML, 'fieldset');
 		}

admin/helpers/compiler/e_Interpretation.php

@@ -2242,7 +2242,11 @@ class Interpretation extends Fields
 				$getItem .= PHP_EOL . "\t" . $tab . "\t\$this->_item[\$pk] = \$data;";
 			}
 			// check if the dispather should be added
-			return str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $getItem);
+			if (isset($this->JEventDispatcher) && ComponentbuilderHelper::checkArray($this->JEventDispatcher))
+			{
+				$getItem = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $getItem);
+			}
+			return $getItem;
 		}
 		return PHP_EOL . "\t" . $tab . "\t//" . $this->setLine(__LINE__) . "add your custom code here.";
 	}
@@ -2693,7 +2697,11 @@ class Interpretation extends Fields
 			}
 		}
 		// check if the dispatcher must be set
-		return str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $methods) . PHP_EOL;
+		if (isset($this->JEventDispatcher) && ComponentbuilderHelper::checkArray($this->JEventDispatcher))
+		{
+			$methods = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $methods);
+		}
+		return $methods . PHP_EOL;
 	}
 
 	public function setCustomViewMethodDefaults($get, $code)
@@ -2842,7 +2850,10 @@ class Interpretation extends Fields
 				}
 			}
 			// check if we should load the dispatcher
-			$getItem = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $getItem);
+			if (isset($this->JEventDispatcher) && ComponentbuilderHelper::checkArray($this->JEventDispatcher))
+			{
+				$getItem = str_replace(array_keys($this->JEventDispatcher), array_values($this->JEventDispatcher), $getItem);
+			}
 			// setup Globals
 			$getItem .= $this->setCustomViewGlobals($get->global, '$item', $asBucket, "\t\t");
 			// setup the custom gets that returns multipal values
@@ -3339,8 +3350,7 @@ class Interpretation extends Fields
 				$path = '/administrator/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js';
 			}
 			// add script to file
-			$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###'] 
-				= $this->setPlaceholders($view['settings']->javascript_file, $this->placeholders);
+			$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###'] = $this->setPlaceholders($view['settings']->javascript_file, $this->placeholders);
 			// add script to view
 			return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path);
 		}
@@ -4817,19 +4827,29 @@ class Interpretation extends Fields
 
 	public function routerParseSwitch(&$view, $viewArray = null, $aliasView = true, $idView = true)
 	{
+		// reset buckets
+		$routerSwitch = array();
 		$isCategory = '';
 		$viewTable = false;
-		if ($viewArray && ComponentbuilderHelper::checkArray($viewArray))
+		if ($viewArray && ComponentbuilderHelper::checkArray($viewArray) && isset($viewArray['settings']) && isset($viewArray['settings']->main_get))
 		{
-			if (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main === 'categories')
+			// check if we have custom script for this router parse switch case
+			if (isset($viewArray['settings']->main_get->add_php_router_parse) && $viewArray['settings']->main_get->add_php_router_parse == 1
+				&& isset($viewArray['settings']->main_get->php_router_parse) && ComponentbuilderHelper::checkString($viewArray['settings']->main_get->php_router_parse))
+			{
+				// load the custom script for the switch based on dynamic get
+				$routerSwitch[] = PHP_EOL . "\t\t\tcase '" . $view . "':";
+				$routerSwitch[] = $this->setPlaceholders($this->setDynamicValues(base64_decode($viewArray['settings']->main_get->php_router_parse)), $this->placeholders);
+				$routerSwitch[] = "\t\t\t\tbreak;";
+				
+				return implode(PHP_EOL, $routerSwitch);
+			}
+			// is this a catogory
+			elseif (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main === 'categories')
 			{
 				$isCategory = ', true'; // TODO we will keep an eye on this....
 			}
-//			elseif (isset($viewArray['settings']->main_get->gettype) && $viewArray['settings']->main_get->gettype == 2)
-//			{
-//				$idView = false; // TODO we will keep an eye on this....
-//				$aliasView = false;
-//			}
+			// get the main table name
 			elseif (isset($viewArray['settings']->main_get->main_get) && ComponentbuilderHelper::checkArray($viewArray['settings']->main_get->main_get))
 			{
 				foreach ($viewArray['settings']->main_get->main_get as $get)
@@ -4843,6 +4863,7 @@ class Interpretation extends Fields
 								$viewTable = str_replace('#__' . $this->fileContentStatic['###component###'] . '_', '', $get['selection']['table']);
 							}
 						}
+						break;
 					}
 				}
 			}
@@ -4850,9 +4871,6 @@ class Interpretation extends Fields
 		// add if tags is added, also for all front item views
 		if ($aliasView)
 		{
-			// build view route switch
-			$routerSwitch = array();
-
 			$routerSwitch[] = PHP_EOL . "\t\t\tcase '" . $view . "':";
 			$routerSwitch[] = "\t\t\t\t\$vars['view'] = '" . $view . "';";
 			$routerSwitch[] = "\t\t\t\tif (is_numeric(\$segments[\$count-1]))";
@@ -4876,14 +4894,9 @@ class Interpretation extends Fields
 			$routerSwitch[] = "\t\t\t\t\t}";
 			$routerSwitch[] = "\t\t\t\t}";
 			$routerSwitch[] = "\t\t\t\tbreak;";
-
-			return implode(PHP_EOL, $routerSwitch);
 		}
 		elseif ($idView)
 		{
-			// build view route switch
-			$routerSwitch = array();
-
 			$routerSwitch[] = PHP_EOL . "\t\t\tcase '" . $view . "':";
 			$routerSwitch[] = "\t\t\t\t\$vars['view'] = '" . $view . "';";
 			$routerSwitch[] = "\t\t\t\tif (is_numeric(\$segments[\$count-1]))";
@@ -4891,21 +4904,15 @@ class Interpretation extends Fields
 			$routerSwitch[] = "\t\t\t\t\t\$vars['id'] = (int) \$segments[\$count-1];";
 			$routerSwitch[] = "\t\t\t\t}";
 			$routerSwitch[] = "\t\t\t\tbreak;";
-
-			return implode(PHP_EOL, $routerSwitch);
 		}
 		else
 		{
-			// build view route switch
-			$routerSwitch = array();
-
 			$routerSwitch[] = PHP_EOL . "\t\t\tcase '" . $view . "':";
 			$routerSwitch[] = "\t\t\t\t\$vars['view'] = '" . $view . "';";
 			$routerSwitch[] = "\t\t\t\tbreak;";
-
-			return implode(PHP_EOL, $routerSwitch);
 		}
-		return '';
+
+		return implode(PHP_EOL, $routerSwitch);
 	}
 
 	public function routerBuildViews(&$view)
@@ -8103,33 +8110,14 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . "\t\t}";
 			$query .= PHP_EOL . "\t\treturn false;";
 			$query .= PHP_EOL . "\t}";
+			
+			// get the header script
+			$header = ComponentbuilderHelper::getDynamicScripts('headers');
 
-			$query .= PHP_EOL . PHP_EOL . "\t/**";
-			$query .= PHP_EOL . "\t* Method to get header.";
-			$query .= PHP_EOL . "\t*";
-			$query .= PHP_EOL . "\t* @return mixed  An array of data items on success, false on failure.";
-			$query .= PHP_EOL . "\t*/";
-			$query .= PHP_EOL . "\tpublic function getExImPortHeaders()";
-			$query .= PHP_EOL . "\t{";
-			$query .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Get a db connection.";
-			$query .= PHP_EOL . "\t\t\$db = JFactory::getDbo();";
-			$query .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " get the columns";
-			$query .= PHP_EOL . "\t\t\$columns = \$db->getTableColumns(" . '"#__' . $this->fileContentStatic['###component###'] . '_' . $viewName_single . '");';
-			$query .= PHP_EOL . "\t\tif (" . $this->fileContentStatic['###Component###'] . "Helper::checkArray(\$columns))";
-			$query .= PHP_EOL . "\t\t{";
-			$query .= PHP_EOL . "\t\t\t//" . $this->setLine(__LINE__) . " remove the headers you don't import/export.";
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['asset_id']);";
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['checked_out']);";
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['checked_out_time']);";
-			$query .= PHP_EOL . "\t\t\t\$headers = new stdClass();";
-			$query .= PHP_EOL . "\t\t\tforeach (\$columns as \$column => \$type)";
-			$query .= PHP_EOL . "\t\t\t{";
-			$query .= PHP_EOL . "\t\t\t\t\$headers->{\$column} = \$column;";
-			$query .= PHP_EOL . "\t\t\t}";
-			$query .= PHP_EOL . "\t\t\treturn \$headers;";
-			$query .= PHP_EOL . "\t\t}";
-			$query .= PHP_EOL . "\t\treturn false;";
-			$query .= PHP_EOL . "\t}";
+			// add getExImPortHeaders
+			$query .= $this->getCustomScriptBuilder('php_import_headers', 'import_' . $viewName_list, PHP_EOL . PHP_EOL, null, true,
+				// set a default script for those with no custom script
+				PHP_EOL . PHP_EOL . $this->setPlaceholders($header, $this->placeholders));
 		}
 		return $query;
 	}

admin/helpers/compiler/f_Infusion.php

@@ -236,14 +236,25 @@ class Infusion extends Interpretation
 			// start dynamic build
 			foreach ($this->componentData->admin_views as $view)
 			{
-				// just to be safe, lets clear the view placeholders
-				$this->clearFromPlaceHolders('view');
 				// set the target
 				$this->target = 'admin';
 				$this->lang = 'admin';
-				// set main keys
-				$viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single);
-				$viewName_list = ComponentbuilderHelper::safeString($view['settings']->name_list);
+
+				// set single view
+				if (isset($view['settings']->name_single))
+				{
+					$viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single);
+				}
+
+				// set list view
+				if (isset($view['settings']->name_list))
+				{
+					$viewName_list = ComponentbuilderHelper::safeString($view['settings']->name_list);
+				}
+
+				// set the view placeholders
+				$this->setViewPlaceholders($view['settings']);
+
 				// set site edit view array
 				if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
 				{
@@ -258,36 +269,14 @@ class Infusion extends Interpretation
 				// set view array
 				$viewarray[] = "\t\t\t\t'" . $viewName_single . "' => '" . $viewName_list . "'";
 				// set the view names
-				if ($view['settings']->name_single != 'null')
+				if (isset($view['settings']->name_single) && $view['settings']->name_single != 'null')
 				{
-					// ###VIEW### <<<DYNAMIC>>>
-					$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');
-					$this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f;
-					$this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f;
-
-					// ###view### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_single]['###view###'] = $viewName_single;
-					$this->fileContentDynamic[$viewName_list]['###view###'] = $viewName_single;
-
-					// set some place holder for the views
-					$this->placeholders['###view###'] = $viewName_single;
-					$this->placeholders['###View###'] = $viewName_f;
-					$this->placeholders['###VIEW###'] = $viewName_u;
-					$this->placeholders['[[[view]]]'] = $viewName_single;
-					$this->placeholders['[[[View]]]'] = $viewName_f;
-					$this->placeholders['[[[VIEW]]]'] = $viewName_u;
-
 					// set license per view if needed
 					$this->setLockLicensePer($viewName_single, $this->target);
 					$this->setLockLicensePer($viewName_list, $this->target);
 
 					// ###FIELDSETS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
+					$this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###'], $viewName_single, $viewName_list);
 
 					// ###ACCESSCONTROL### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single);
@@ -391,35 +380,15 @@ class Infusion extends Interpretation
 					}
 				}
 				// set the views names
-				if ($view['settings']->name_list != 'null')
+				if (isset($view['settings']->name_list) && $view['settings']->name_list != 'null')
 				{
 					$this->lang = 'admin';
-					// ###VIEWS### <<<DYNAMIC>>>
-					$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');
-					$this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f;
-					$this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f;
-
-					// ###views### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_list]['###views###'] = $viewName_list;
-					$this->fileContentDynamic[$viewName_single]['###views###'] = $viewName_list;
 					// ###ICOMOON### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###ICOMOON###'] = $view['icomoon'];
 
-					// set some place holder for the views
-					$this->placeholders['###views###'] = $viewName_list;
-					$this->placeholders['###Views###'] = $viewsName_f;
-					$this->placeholders['###VIEWS###'] = $viewsName_u;
-					$this->placeholders['[[[views]]]'] = $viewName_list;
-					$this->placeholders['[[[Views]]]'] = $viewsName_f;
-					$this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
-
 					// set the export/import option
-					if (isset($view['port']) && $view['port'])
+					if (isset($view['port']) && $view['port'] || 1 == $view['settings']->add_custom_import)
 					{
 						$this->eximportView[$viewName_list] = true;
 						if (1 == $view['settings']->add_custom_import)
@@ -1083,6 +1052,82 @@ class Infusion extends Interpretation
 		return false;
 	}
 
+	/**
+	 * Set the view place holders to global scope
+	 * 
+	 * @param   object  $view  The view settings
+	 * 
+	 * @ return void
+	 */
+	protected function setViewPlaceholders(&$view)
+	{
+		// just to be safe, lets clear previous view placeholders
+		$this->clearFromPlaceHolders('view');
+
+		// ###VIEW### <<<DYNAMIC>>>
+		if (isset($view->name_single))
+		{
+			// set main keys
+			$viewName_single = ComponentbuilderHelper::safeString($view->name_single);
+			$viewName_u = ComponentbuilderHelper::safeString($view->name_single, 'U');
+			$viewName_f = ComponentbuilderHelper::safeString($view->name_single, 'F');
+
+			// set some place holder for the views
+			$this->placeholders['###view###'] = $viewName_single;
+			$this->placeholders['###View###'] = $viewName_f;
+			$this->placeholders['###VIEW###'] = $viewName_u;
+			$this->placeholders['[[[view]]]'] = $viewName_single;
+			$this->placeholders['[[[View]]]'] = $viewName_f;
+			$this->placeholders['[[[VIEW]]]'] = $viewName_u;
+		}
+
+		// ###VIEWS### <<<DYNAMIC>>>
+		if (isset($view->name_list))
+		{
+			$viewName_list = ComponentbuilderHelper::safeString($view->name_list);
+			$viewsName_u = ComponentbuilderHelper::safeString($view->name_list, 'U');
+			$viewsName_f = ComponentbuilderHelper::safeString($view->name_list, 'F');
+
+			// set some place holder for the views
+			$this->placeholders['###views###'] = $viewName_list;
+			$this->placeholders['###Views###'] = $viewsName_f;
+			$this->placeholders['###VIEWS###'] = $viewsName_u;
+			$this->placeholders['[[[views]]]'] = $viewName_list;
+			$this->placeholders['[[[Views]]]'] = $viewsName_f;
+			$this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
+		}
+
+		// ###view### <<<DYNAMIC>>>
+		if (isset($viewName_single))
+		{
+			$this->fileContentDynamic[$viewName_single]['###view###'] = $viewName_single;
+			$this->fileContentDynamic[$viewName_single]['###VIEW###'] = $viewName_u;
+			$this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f;
+
+			if (isset($viewName_list))
+			{
+				$this->fileContentDynamic[$viewName_list]['###view###'] = $viewName_single;
+				$this->fileContentDynamic[$viewName_list]['###VIEW###'] = $viewName_u;
+				$this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f;
+			}
+		}
+
+		// ###views### <<<DYNAMIC>>>
+		if (isset($viewName_list))
+		{
+			$this->fileContentDynamic[$viewName_list]['###views###'] = $viewName_list;
+			$this->fileContentDynamic[$viewName_list]['###VIEWS###'] = $viewsName_u;
+			$this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f;
+
+			if (isset($viewName_single))
+			{
+				$this->fileContentDynamic[$viewName_single]['###views###'] = $viewName_list;
+				$this->fileContentDynamic[$viewName_single]['###VIEWS###'] = $viewsName_u;
+				$this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f;
+			}
+		}
+	}
+
 	/**
 	 * Build the lang values and insert to fiel
 	 * 

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

@@ -703,6 +703,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT="Php Import Ext"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT="// PHP here for the checkExtension Method"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL="Check Extension Method PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS="Php Import Headers"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT="// PHP here for the getExImPortHeaders Method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL="get Export Import Headers PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
@@ -3205,6 +3209,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEMS_LABEL="Add PHP (before
 COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_BEFORE_GETITEM_LABEL="Add PHP (before getting the Item)"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_GETLISTQUERY="Add Php Getlistquery"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_GETLISTQUERY_LABEL="Add PHP (getListQuery - JModelList)"
+COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE="Add Php Router Parse"
+COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE_DESCRIPTION="The option to override the default JCB implementation of the router parse method for the related view where this dynamicGet is added."
+COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE_LABEL="Add PHP (parse Method) - in Router"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ARRAY_VALUE="Array Value"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ASCENDING="Ascending"
 COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL="AS"
@@ -3377,6 +3384,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY="Php Getlistquery"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL="PHP"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE="Php Router Parse"
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_DESCRIPTION="Add your PHP here! [Do not add the php tags]<br />Add the php code to override the default JCB implementation of the router parse method for the related view where this dynamicGet is added."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_HINT="// PHP Here that should run in the parse Method -> switch | (array) $segments - the segments of the URL to parse | (array) $vars - the URL attributes to be used by the application."
+COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_LABEL="PHP"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PLEASE_SELECT="Please select"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PP="pp"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PUBLISHING="Publishing"
@@ -3409,7 +3420,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
 COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TWEAK="Tweak"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@@ -4115,10 +4126,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE="Joomla Components Edit State"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC="Allows the users in this group to export export joomla components"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT="Joomla Components Import"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT_DESC="Allows the users in this group to import import joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_ARCHIVED="%s Joomla Components archived."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_ARCHIVED_1="%s Joomla Component archived."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_N_ITEMS_CHECKED_IN_0="No Joomla Component successfully checked in."

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

@@ -506,10 +506,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE="Joomla Components Edit State"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Version"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version joomla components"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT="Joomla Components Export"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC="Allows the users in this group to export export joomla components"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT="Joomla Components Import"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT_DESC="Allows the users in this group to import import joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -36,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 	'php_import_display',
 	'html_import_view',
 	'php_import',
+	'php_import_headers',
 	'php_import_setdata',
 	'php_import_save',
 	'php_import_ext'

admin/layouts/dynamic_get/custom_script_fullwidth.php

@@ -39,7 +39,9 @@ $fields = $displayData->get('fields') ?: array(
 	'add_php_before_getitems',
 	'php_before_getitems',
 	'add_php_after_getitems',
-	'php_after_getitems'
+	'php_after_getitems',
+	'add_php_router_parse',
+	'php_router_parse'
 );
 
 ?>

admin/layouts/fieldtype/fields_fullwidth.php

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

admin/models/admin_view.php

@@ -100,6 +100,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@@ -132,14 +140,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -148,112 +148,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
-			if (!empty($item->php_after_delete))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_after_delete.
-				$item->php_after_delete = base64_decode($item->php_after_delete);
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
 			}
 
-			if (!empty($item->php_save))
+			if (!empty($item->html_import_view))
 			{
-				// base64 Decode php_save.
-				$item->php_save = base64_decode($item->php_save);
-			}
-
-			if (!empty($item->php_batchmove))
-			{
-				// base64 Decode php_batchmove.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
-			}
-
-			if (!empty($item->php_allowedit))
-			{
-				// base64 Decode php_allowedit.
-				$item->php_allowedit = base64_decode($item->php_allowedit);
-			}
-
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
-			}
-
-			if (!empty($item->php_getitems))
-			{
-				// base64 Decode php_getitems.
-				$item->php_getitems = base64_decode($item->php_getitems);
-			}
-
-			if (!empty($item->php_import))
-			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
-			}
-
-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
-			}
-
-			if (!empty($item->php_getitems_after_all))
-			{
-				// base64 Decode php_getitems_after_all.
-				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-			}
-
-			if (!empty($item->php_before_save))
-			{
-				// base64 Decode php_before_save.
-				$item->php_before_save = base64_decode($item->php_before_save);
-			}
-
-			if (!empty($item->php_postsavehook))
-			{
-				// base64 Decode php_postsavehook.
-				$item->php_postsavehook = base64_decode($item->php_postsavehook);
-			}
-
-			if (!empty($item->php_batchcopy))
-			{
-				// base64 Decode php_batchcopy.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
-			}
-
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
-			if (!empty($item->php_before_delete))
-			{
-				// base64 Decode php_before_delete.
-				$item->php_before_delete = base64_decode($item->php_before_delete);
-			}
-
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_import_display))
-			{
-				// base64 Decode php_import_display.
-				$item->php_import_display = base64_decode($item->php_import_display);
+				// base64 Decode html_import_view.
+				$item->html_import_view = base64_decode($item->html_import_view);
 			}
 
 			if (!empty($item->php_import_save))
@@ -262,48 +166,138 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 			if (!empty($item->css_view))
 			{
 				// base64 Decode css_view.
 				$item->css_view = base64_decode($item->css_view);
 			}
 
+			if (!empty($item->php_getitems))
+			{
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
+			}
+
+			if (!empty($item->php_getitems_after_all))
+			{
+				// base64 Decode php_getitems_after_all.
+				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
+			}
+
 			if (!empty($item->css_views))
 			{
 				// base64 Decode css_views.
 				$item->css_views = base64_decode($item->css_views);
 			}
 
+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_before_save))
+			{
+				// base64 Decode php_before_save.
+				$item->php_before_save = base64_decode($item->php_before_save);
+			}
+
 			if (!empty($item->javascript_view_file))
 			{
 				// base64 Decode javascript_view_file.
 				$item->javascript_view_file = base64_decode($item->javascript_view_file);
 			}
 
+			if (!empty($item->php_save))
+			{
+				// base64 Decode php_save.
+				$item->php_save = base64_decode($item->php_save);
+			}
+
+			if (!empty($item->php_postsavehook))
+			{
+				// base64 Decode php_postsavehook.
+				$item->php_postsavehook = base64_decode($item->php_postsavehook);
+			}
+
 			if (!empty($item->javascript_view_footer))
 			{
 				// base64 Decode javascript_view_footer.
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->php_allowedit))
+			{
+				// base64 Decode php_allowedit.
+				$item->php_allowedit = base64_decode($item->php_allowedit);
+			}
+
+			if (!empty($item->php_batchcopy))
+			{
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
 			if (!empty($item->javascript_views_file))
 			{
 				// base64 Decode javascript_views_file.
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
+			}
+
+			if (!empty($item->php_before_delete))
+			{
+				// base64 Decode php_before_delete.
+				$item->php_before_delete = base64_decode($item->php_before_delete);
+			}
+
+			if (!empty($item->php_after_delete))
+			{
+				// base64 Decode php_after_delete.
+				$item->php_after_delete = base64_decode($item->php_after_delete);
+			}
+
 			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.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
@@ -316,22 +310,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_controller_list = base64_decode($item->php_controller_list);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_model_list))
 			{
 				// base64 Decode php_model_list.
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
+			if (!empty($item->php_import_display))
+			{
+				// base64 Decode php_import_display.
+				$item->php_import_display = base64_decode($item->php_import_display);
+			}
+
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
-			if (!empty($item->html_import_view))
+			if (!empty($item->php_import))
 			{
-				// base64 Decode html_import_view.
-				$item->html_import_view = base64_decode($item->html_import_view);
+				// base64 Decode php_import.
+				$item->php_import = base64_decode($item->php_import);
 			}
 
 			if (!empty($item->php_import_setdata))
@@ -1186,6 +1192,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1238,19 +1257,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -1264,112 +1270,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_after_delete string to base64 string.
-		if (isset($data['php_after_delete']))
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
 		}
 
-		// Set the php_save string to base64 string.
-		if (isset($data['php_save']))
+		// Set the html_import_view string to base64 string.
+		if (isset($data['html_import_view']))
 		{
-			$data['php_save'] = base64_encode($data['php_save']);
-		}
-
-		// Set the php_batchmove string to base64 string.
-		if (isset($data['php_batchmove']))
-		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
-		}
-
-		// Set the php_allowedit string to base64 string.
-		if (isset($data['php_allowedit']))
-		{
-			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
-		}
-
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
-		}
-
-		// Set the php_getitems string to base64 string.
-		if (isset($data['php_getitems']))
-		{
-			$data['php_getitems'] = base64_encode($data['php_getitems']);
-		}
-
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
-		{
-			$data['php_import'] = base64_encode($data['php_import']);
-		}
-
-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
-		}
-
-		// Set the php_getitems_after_all string to base64 string.
-		if (isset($data['php_getitems_after_all']))
-		{
-			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
-		}
-
-		// Set the php_before_save string to base64 string.
-		if (isset($data['php_before_save']))
-		{
-			$data['php_before_save'] = base64_encode($data['php_before_save']);
-		}
-
-		// Set the php_postsavehook string to base64 string.
-		if (isset($data['php_postsavehook']))
-		{
-			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
-		}
-
-		// Set the php_batchcopy string to base64 string.
-		if (isset($data['php_batchcopy']))
-		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
-		}
-
-		// Set the php_before_publish string to base64 string.
-		if (isset($data['php_before_publish']))
-		{
-			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
-		}
-
-		// Set the php_before_delete string to base64 string.
-		if (isset($data['php_before_delete']))
-		{
-			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
-		}
-
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_import_display string to base64 string.
-		if (isset($data['php_import_display']))
-		{
-			$data['php_import_display'] = base64_encode($data['php_import_display']);
+			$data['html_import_view'] = base64_encode($data['html_import_view']);
 		}
 
 		// Set the php_import_save string to base64 string.
@@ -1378,48 +1288,138 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
+		}
+
 		// Set the css_view string to base64 string.
 		if (isset($data['css_view']))
 		{
 			$data['css_view'] = base64_encode($data['css_view']);
 		}
 
+		// Set the php_getitems string to base64 string.
+		if (isset($data['php_getitems']))
+		{
+			$data['php_getitems'] = base64_encode($data['php_getitems']);
+		}
+
+		// Set the php_getitems_after_all string to base64 string.
+		if (isset($data['php_getitems_after_all']))
+		{
+			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
+		}
+
 		// Set the css_views string to base64 string.
 		if (isset($data['css_views']))
 		{
 			$data['css_views'] = base64_encode($data['css_views']);
 		}
 
+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_before_save string to base64 string.
+		if (isset($data['php_before_save']))
+		{
+			$data['php_before_save'] = base64_encode($data['php_before_save']);
+		}
+
 		// Set the javascript_view_file string to base64 string.
 		if (isset($data['javascript_view_file']))
 		{
 			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
 		}
 
+		// Set the php_save string to base64 string.
+		if (isset($data['php_save']))
+		{
+			$data['php_save'] = base64_encode($data['php_save']);
+		}
+
+		// Set the php_postsavehook string to base64 string.
+		if (isset($data['php_postsavehook']))
+		{
+			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
+		}
+
 		// Set the javascript_view_footer string to base64 string.
 		if (isset($data['javascript_view_footer']))
 		{
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the php_allowedit string to base64 string.
+		if (isset($data['php_allowedit']))
+		{
+			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+		}
+
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
+		{
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
 		// Set the javascript_views_file string to base64 string.
 		if (isset($data['javascript_views_file']))
 		{
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+		}
+
+		// Set the php_before_delete string to base64 string.
+		if (isset($data['php_before_delete']))
+		{
+			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
+		}
+
+		// Set the php_after_delete string to base64 string.
+		if (isset($data['php_after_delete']))
+		{
+			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
+		}
+
 		// 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']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
@@ -1432,22 +1432,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_controller_list'] = base64_encode($data['php_controller_list']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_model_list string to base64 string.
 		if (isset($data['php_model_list']))
 		{
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
+		// Set the php_import_display string to base64 string.
+		if (isset($data['php_import_display']))
+		{
+			$data['php_import_display'] = base64_encode($data['php_import_display']);
+		}
+
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
-		// Set the html_import_view string to base64 string.
-		if (isset($data['html_import_view']))
+		// Set the php_import string to base64 string.
+		if (isset($data['php_import']))
 		{
-			$data['html_import_view'] = base64_encode($data['html_import_view']);
+			$data['php_import'] = base64_encode($data['php_import']);
 		}
 
 		// Set the php_import_setdata string to base64 string.

admin/models/admin_views.php

@@ -262,68 +262,70 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_after_delete
-						$item->php_after_delete = base64_decode($item->php_after_delete);
-						// decode php_save
-						$item->php_save = base64_decode($item->php_save);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
-						// decode php_getitems
-						$item->php_getitems = base64_decode($item->php_getitems);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
-						// decode php_getitems_after_all
-						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// decode php_before_delete
-						$item->php_before_delete = base64_decode($item->php_before_delete);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
+						// decode html_import_view
+						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
+						// decode php_getitems
+						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_getitems_after_all
+						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
 						// decode javascript_view_file
 						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode php_save
+						$item->php_save = base64_decode($item->php_save);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_allowedit
+						$item->php_allowedit = base64_decode($item->php_allowedit);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
+						// decode php_before_delete
+						$item->php_before_delete = base64_decode($item->php_before_delete);
+						// decode php_after_delete
+						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
+						// decode php_import_display
+						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_import
+						$item->php_import = base64_decode($item->php_import);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext

admin/models/ajax.php

@@ -333,10 +333,10 @@ class ComponentbuilderModelAjax extends JModelList
 		return '';
 	}			
 
-	public static function getImportScripts($type)
+	public static function getDynamicScripts($type)
 	{
 		// get from global helper
-		return ComponentbuilderHelper::getImportScripts($type);
+		return ComponentbuilderHelper::getDynamicScripts($type);
 	}
 
 	protected $functionArray = array(
@@ -1881,7 +1881,7 @@ class ComponentbuilderModelAjax extends JModelList
 		$query['c']['table'] = 'custom_admin_view';
 		$query['c']['view'] = 'custom_admin_views';
 		$query['c']['select'] = array('id', 'system_name', 'default','php_view','php_jview','php_jview_display','php_document',
-			'js_document','css_document','css','php_model','php_controller');
+			'js_document','css_document','css','php_ajaxmethod','php_model','php_controller');
 		$query['c']['not_base64'] = array();
 		$query['c']['name'] = 'system_name';
 

admin/models/dynamic_get.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->join_view_table))
-			{
-				// Convert the join_view_table field to an array.
-				$join_view_table = new Registry;
-				$join_view_table->loadString($item->join_view_table);
-				$item->join_view_table = $join_view_table->toArray();
-			}
-
 			if (!empty($item->join_db_table))
 			{
 				// Convert the join_db_table field to an array.
@@ -148,6 +140,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->global = $global->toArray();
 			}
 
+			if (!empty($item->join_view_table))
+			{
+				// Convert the join_view_table field to an array.
+				$join_view_table = new Registry;
+				$join_view_table->loadString($item->join_view_table);
+				$item->join_view_table = $join_view_table->toArray();
+			}
+
 			if (!empty($item->php_custom_get))
 			{
 				// base64 Decode php_custom_get.
@@ -184,6 +184,12 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->php_after_getitems = base64_decode($item->php_after_getitems);
 			}
 
+			if (!empty($item->php_router_parse))
+			{
+				// base64 Decode php_router_parse.
+				$item->php_router_parse = base64_decode($item->php_router_parse);
+			}
+
 			if (!empty($item->php_calculation))
 			{
 				// base64 Decode php_calculation.
@@ -970,19 +976,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the join_view_table items to data.
-		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
-		{
-			$join_view_table = new JRegistry;
-			$join_view_table->loadArray($data['join_view_table']);
-			$data['join_view_table'] = (string) $join_view_table;
-		}
-		elseif (!isset($data['join_view_table']))
-		{
-			// Set the empty join_view_table to data
-			$data['join_view_table'] = '';
-		}
-
 		// Set the join_db_table items to data.
 		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
 		{
@@ -1048,6 +1041,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['global'] = '';
 		}
 
+		// Set the join_view_table items to data.
+		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
+		{
+			$join_view_table = new JRegistry;
+			$join_view_table->loadArray($data['join_view_table']);
+			$data['join_view_table'] = (string) $join_view_table;
+		}
+		elseif (!isset($data['join_view_table']))
+		{
+			// Set the empty join_view_table to data
+			$data['join_view_table'] = '';
+		}
+
 		// Set the php_custom_get string to base64 string.
 		if (isset($data['php_custom_get']))
 		{
@@ -1084,6 +1090,12 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['php_after_getitems'] = base64_encode($data['php_after_getitems']);
 		}
 
+		// Set the php_router_parse string to base64 string.
+		if (isset($data['php_router_parse']))
+		{
+			$data['php_router_parse'] = base64_encode($data['php_router_parse']);
+		}
+
 		// Set the php_calculation string to base64 string.
 		if (isset($data['php_calculation']))
 		{

admin/models/dynamic_gets.php

@@ -333,6 +333,8 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 						$item->php_before_getitems = base64_decode($item->php_before_getitems);
 						// decode php_after_getitems
 						$item->php_after_getitems = base64_decode($item->php_after_getitems);
+						// decode php_router_parse
+						$item->php_router_parse = base64_decode($item->php_router_parse);
 						// decode php_calculation
 						$item->php_calculation = base64_decode($item->php_calculation);
 						// unset the values we don't want exported.

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 getWaafields()
+	public function getWadfields()
 	{
 		// 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->selectionTranslationWaafields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaafields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaafields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaafields($item->store, 'store');
+					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
 				}
 			}
 
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWaafields($value,$name)
+	public function selectionTranslationWadfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/models/forms/admin_view.js

@@ -53,10 +53,11 @@ jform_vvvvvxyvxo_required = false;
 jform_vvvvvxyvxp_required = false;
 jform_vvvvvxyvxq_required = false;
 jform_vvvvvxyvxr_required = false;
-jform_vvvvvyavxs_required = false;
+jform_vvvvvxyvxs_required = false;
 jform_vvvvvyavxt_required = false;
 jform_vvvvvyavxu_required = false;
 jform_vvvvvyavxv_required = false;
+jform_vvvvvyavxw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -945,34 +946,44 @@ function vvvvvxy(add_custom_import_vvvvvxy)
 			jform_vvvvvxyvxo_required = false;
 		}
 
-		jQuery('#jform_php_import').closest('.control-group').show();
+		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		if (jform_vvvvvxyvxp_required)
+		{
+			updateFieldRequired('php_import_headers',0);
+			jQuery('#jform_php_import_headers').prop('required','required');
+			jQuery('#jform_php_import_headers').attr('aria-required',true);
+			jQuery('#jform_php_import_headers').addClass('required');
+			jform_vvvvvxyvxp_required = false;
+		}
+
+		jQuery('#jform_php_import').closest('.control-group').show();
+		if (jform_vvvvvxyvxq_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvxyvxp_required = false;
+			jform_vvvvvxyvxq_required = false;
 		}
 
 		jQuery('#jform_php_import_save').closest('.control-group').show();
-		if (jform_vvvvvxyvxq_required)
+		if (jform_vvvvvxyvxr_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvvxyvxq_required = false;
+			jform_vvvvvxyvxr_required = false;
 		}
 
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
-		if (jform_vvvvvxyvxr_required)
+		if (jform_vvvvvxyvxs_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvvxyvxr_required = false;
+			jform_vvvvvxyvxs_required = false;
 		}
 
 	}
@@ -1006,32 +1017,41 @@ function vvvvvxy(add_custom_import_vvvvvxy)
 			jQuery('#jform_php_import_ext').removeClass('required');
 			jform_vvvvvxyvxo_required = true;
 		}
-		jQuery('#jform_php_import').closest('.control-group').hide();
+		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		if (!jform_vvvvvxyvxp_required)
+		{
+			updateFieldRequired('php_import_headers',1);
+			jQuery('#jform_php_import_headers').removeAttr('required');
+			jQuery('#jform_php_import_headers').removeAttr('aria-required');
+			jQuery('#jform_php_import_headers').removeClass('required');
+			jform_vvvvvxyvxp_required = true;
+		}
+		jQuery('#jform_php_import').closest('.control-group').hide();
+		if (!jform_vvvvvxyvxq_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvxyvxp_required = true;
+			jform_vvvvvxyvxq_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
-		if (!jform_vvvvvxyvxq_required)
+		if (!jform_vvvvvxyvxr_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvvxyvxq_required = true;
+			jform_vvvvvxyvxr_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
-		if (!jform_vvvvvxyvxr_required)
+		if (!jform_vvvvvxyvxs_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvvxyvxr_required = true;
+			jform_vvvvvxyvxs_required = true;
 		}
 	}
 }
@@ -1058,43 +1078,43 @@ function vvvvvya(add_custom_button_vvvvvya)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyavxs_required)
+		if (jform_vvvvvyavxt_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_vvvvvyavxs_required = false;
+			jform_vvvvvyavxt_required = false;
 		}
 
 		jQuery('#jform_php_controller_list').closest('.control-group').show();
-		if (jform_vvvvvyavxt_required)
+		if (jform_vvvvvyavxu_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvyavxt_required = false;
+			jform_vvvvvyavxu_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyavxu_required)
+		if (jform_vvvvvyavxv_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_vvvvvyavxu_required = false;
+			jform_vvvvvyavxv_required = false;
 		}
 
 		jQuery('#jform_php_model_list').closest('.control-group').show();
-		if (jform_vvvvvyavxv_required)
+		if (jform_vvvvvyavxw_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvyavxv_required = false;
+			jform_vvvvvyavxw_required = false;
 		}
 
 	}
@@ -1102,40 +1122,40 @@ function vvvvvya(add_custom_button_vvvvvya)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyavxs_required)
+		if (!jform_vvvvvyavxt_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_vvvvvyavxs_required = true;
+			jform_vvvvvyavxt_required = true;
 		}
 		jQuery('#jform_php_controller_list').closest('.control-group').hide();
-		if (!jform_vvvvvyavxt_required)
+		if (!jform_vvvvvyavxu_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvyavxt_required = true;
+			jform_vvvvvyavxu_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyavxu_required)
+		if (!jform_vvvvvyavxv_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_vvvvvyavxu_required = true;
+			jform_vvvvvyavxv_required = true;
 		}
 		jQuery('#jform_php_model_list').closest('.control-group').hide();
-		if (!jform_vvvvvyavxv_required)
+		if (!jform_vvvvvyavxw_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvyavxv_required = true;
+			jform_vvvvvyavxw_required = true;
 		}
 	}
 }
@@ -1183,7 +1203,7 @@ jQuery(document).ready(function()
 	// set button
 	addButtonID('admin_fields','create_edit_buttons', 1); // <-- first
 	var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	getImportScripts(valueSwitch);
+	getDynamicScripts(valueSwitch);
 	// now load the fields
 	getAjaxDisplay('admin_fields');
 	getAjaxDisplay('admin_fields_conditions');
@@ -1290,7 +1310,7 @@ function getLinked(){
 }			
 
 function getTableColumns_server(tableName){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json";
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&vdm="+vastDevMod;
 	if(token.length > 0 && tableName.length > 0){
 		var request = 'token='+token+'&table='+tableName;
 	}
@@ -1320,8 +1340,8 @@ function getTableColumns(fieldKey, table_, nr_){
 	}
 }
 
-function getImportScripts_server(typpe){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getImportScripts&format=json";
+function getDynamicScripts_server(typpe){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&vdm="+vastDevMod;
 	if(token.length > 0 && typpe.length > 0){
 		var request = 'token='+token+'&type='+typpe;
 	}
@@ -1334,18 +1354,19 @@ function getImportScripts_server(typpe){
 	});
 }
 
-function getImportScripts(id){
+function getDynamicScripts(id){
 	if (1 == id) {
 		// get the current values
 		var current_import_display = jQuery('textarea#jform_php_import_display').val();
 		var current_import = jQuery('textarea#jform_php_import').val();
+		var current_headers = jQuery('textarea#jform_php_import_headers').val();
 		var current_setdata = jQuery('textarea#jform_php_import_setdata').val();
 		var current_save = jQuery('textarea#jform_php_import_save').val();
 		var current_view = jQuery('textarea#jform_html_import_view').val();
 		var current_ext = jQuery('textarea#jform_php_import_ext').val();
 		// set the display method script
 		if(current_import_display.length == 0){
-			getImportScripts_server('display').done(function(result) {
+			getDynamicScripts_server('display').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import_display').val(result);
 				}
@@ -1353,15 +1374,23 @@ function getImportScripts(id){
 		}
 		// set the import method script
 		if(current_import.length == 0){
-			getImportScripts_server('import').done(function(result) {
+			getDynamicScripts_server('import').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import').val(result);
 				}
 			});
 		}
+		// set the headers method script
+		if(current_headers.length == 0){
+			getDynamicScripts_server('headers').done(function(result) {
+				if(result){
+					jQuery('textarea#jform_php_import_headers').val(result);
+				}
+			});
+		}
 		// set the setData method script
 		if(current_setdata.length == 0){
-			getImportScripts_server('setdata').done(function(result) {
+			getDynamicScripts_server('setdata').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import_setdata').val(result);
 				}
@@ -1369,7 +1398,7 @@ function getImportScripts(id){
 		}
 		// set the save method script
 		if(current_save.length == 0){
-			getImportScripts_server('save').done(function(result) {
+			getDynamicScripts_server('save').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import_save').val(result);
 				}
@@ -1377,7 +1406,7 @@ function getImportScripts(id){
 		}
 		// set the view script
 		if(current_view.length == 0){
-			getImportScripts_server('view').done(function(result) {
+			getDynamicScripts_server('view').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_html_import_view').val(result);
 				}
@@ -1385,7 +1414,7 @@ function getImportScripts(id){
 		}
 		// set the import ext script
 		if(current_ext.length == 0){
-			getImportScripts_server('ext').done(function(result) {
+			getDynamicScripts_server('ext').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import_ext').val(result);
 				}

admin/models/forms/custom_admin_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvybvxw_required = false;
-jform_vvvvvycvxx_required = false;
-jform_vvvvvydvxy_required = false;
-jform_vvvvvyevxz_required = false;
-jform_vvvvvyfvya_required = false;
-jform_vvvvvygvyb_required = false;
-jform_vvvvvyhvyc_required = false;
-jform_vvvvvyivyd_required = false;
+jform_vvvvvybvxx_required = false;
+jform_vvvvvycvxy_required = false;
+jform_vvvvvydvxz_required = false;
+jform_vvvvvyevya_required = false;
+jform_vvvvvyfvyb_required = false;
+jform_vvvvvygvyc_required = false;
+jform_vvvvvyhvyd_required = false;
 jform_vvvvvyivye_required = false;
-jform_vvvvvyjvyf_required = false;
-jform_vvvvvykvyg_required = false;
+jform_vvvvvyivyf_required = false;
+jform_vvvvvyjvyg_required = false;
+jform_vvvvvykvyh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -76,26 +76,26 @@ function vvvvvyb(add_php_view_vvvvvyb)
 	if (add_php_view_vvvvvyb == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvybvxw_required)
+		if (jform_vvvvvybvxx_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_vvvvvybvxw_required = false;
+			jform_vvvvvybvxx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvybvxw_required)
+		if (!jform_vvvvvybvxx_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_vvvvvybvxw_required = true;
+			jform_vvvvvybvxx_required = true;
 		}
 	}
 }
@@ -107,26 +107,26 @@ function vvvvvyc(add_php_jview_display_vvvvvyc)
 	if (add_php_jview_display_vvvvvyc == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvycvxx_required)
+		if (jform_vvvvvycvxy_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_vvvvvycvxx_required = false;
+			jform_vvvvvycvxy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvycvxx_required)
+		if (!jform_vvvvvycvxy_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvycvxx_required = true;
+			jform_vvvvvycvxy_required = true;
 		}
 	}
 }
@@ -138,26 +138,26 @@ function vvvvvyd(add_php_jview_vvvvvyd)
 	if (add_php_jview_vvvvvyd == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvydvxy_required)
+		if (jform_vvvvvydvxz_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvydvxy_required = false;
+			jform_vvvvvydvxz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvydvxy_required)
+		if (!jform_vvvvvydvxz_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvydvxy_required = true;
+			jform_vvvvvydvxz_required = true;
 		}
 	}
 }
@@ -169,26 +169,26 @@ function vvvvvye(add_php_document_vvvvvye)
 	if (add_php_document_vvvvvye == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyevxz_required)
+		if (jform_vvvvvyevya_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyevxz_required = false;
+			jform_vvvvvyevya_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyevxz_required)
+		if (!jform_vvvvvyevya_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyevxz_required = true;
+			jform_vvvvvyevya_required = true;
 		}
 	}
 }
@@ -200,26 +200,26 @@ function vvvvvyf(add_css_document_vvvvvyf)
 	if (add_css_document_vvvvvyf == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyfvya_required)
+		if (jform_vvvvvyfvyb_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyfvya_required = false;
+			jform_vvvvvyfvyb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyfvya_required)
+		if (!jform_vvvvvyfvyb_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyfvya_required = true;
+			jform_vvvvvyfvyb_required = true;
 		}
 	}
 }
@@ -231,26 +231,26 @@ function vvvvvyg(add_javascript_file_vvvvvyg)
 	if (add_javascript_file_vvvvvyg == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvygvyb_required)
+		if (jform_vvvvvygvyc_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvygvyb_required = false;
+			jform_vvvvvygvyc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvygvyb_required)
+		if (!jform_vvvvvygvyc_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvygvyb_required = true;
+			jform_vvvvvygvyc_required = true;
 		}
 	}
 }
@@ -262,26 +262,26 @@ function vvvvvyh(add_js_document_vvvvvyh)
 	if (add_js_document_vvvvvyh == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyhvyd_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_vvvvvyhvyc_required = false;
+			jform_vvvvvyhvyd_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyhvyd_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_vvvvvyhvyc_required = true;
+			jform_vvvvvyhvyd_required = true;
 		}
 	}
 }
@@ -294,23 +294,23 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyivyd_required)
+		if (jform_vvvvvyivye_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_vvvvvyivyd_required = false;
+			jform_vvvvvyivye_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvyivyf_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_vvvvvyivye_required = false;
+			jform_vvvvvyivyf_required = false;
 		}
 
 	}
@@ -318,22 +318,22 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyivyd_required)
+		if (!jform_vvvvvyivye_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_vvvvvyivyd_required = true;
+			jform_vvvvvyivye_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
+		if (!jform_vvvvvyivyf_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_vvvvvyivye_required = true;
+			jform_vvvvvyivyf_required = true;
 		}
 	}
 }
@@ -345,26 +345,26 @@ function vvvvvyj(add_css_vvvvvyj)
 	if (add_css_vvvvvyj == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyjvyf_required)
+		if (jform_vvvvvyjvyg_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyjvyf_required = false;
+			jform_vvvvvyjvyg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyf_required)
+		if (!jform_vvvvvyjvyg_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyjvyf_required = true;
+			jform_vvvvvyjvyg_required = true;
 		}
 	}
 }
@@ -377,13 +377,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvykvyg_required)
+		if (jform_vvvvvykvyh_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_vvvvvykvyg_required = false;
+			jform_vvvvvykvyh_required = false;
 		}
 
 	}
@@ -391,13 +391,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvykvyg_required)
+		if (!jform_vvvvvykvyh_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_vvvvvykvyg_required = true;
+			jform_vvvvvykvyh_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzuvzm_required = false;
-jform_vvvvvzvvzn_required = false;
-jform_vvvvvzvvzo_required = false;
-jform_vvvvvzvvzp_required = false;
+jform_vvvvvzxvzp_required = false;
+jform_vvvvvzyvzq_required = false;
+jform_vvvvvzyvzr_required = false;
+jform_vvvvvzyvzs_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu);
-
-	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(target_vvvvvzv);
-
-	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
-
-	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+	vvvvvzx(target_vvvvvzx);
+
+	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzy(target_vvvvvzy);
+
+	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
+
+	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
 });
 
-// the vvvvvzu function
-function vvvvvzu(target_vvvvvzu)
+// the vvvvvzx function
+function vvvvvzx(target_vvvvvzx)
 {
 	// set the function logic
-	if (target_vvvvvzu == 2)
+	if (target_vvvvvzx == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzuvzm_required)
+		if (jform_vvvvvzxvzp_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_vvvvvzuvzm_required = false;
+			jform_vvvvvzxvzp_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzu(target_vvvvvzu)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzm_required)
+		if (!jform_vvvvvzxvzp_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_vvvvvzuvzm_required = true;
+			jform_vvvvvzxvzp_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzv function
-function vvvvvzv(target_vvvvvzv)
+// the vvvvvzy function
+function vvvvvzy(target_vvvvvzy)
 {
 	// set the function logic
-	if (target_vvvvvzv == 1)
+	if (target_vvvvvzy == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzvvzn_required)
+		if (jform_vvvvvzyvzq_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzvvzn_required = false;
+			jform_vvvvvzyvzq_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzvvzo_required)
+		if (jform_vvvvvzyvzr_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzvvzo_required = false;
+			jform_vvvvvzyvzr_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_vvvvvzvvzp_required)
+		if (jform_vvvvvzyvzs_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzvvzp_required = false;
+			jform_vvvvvzyvzs_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzn_required)
+		if (!jform_vvvvvzyvzq_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzvvzn_required = true;
+			jform_vvvvvzyvzq_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzo_required)
+		if (!jform_vvvvvzyvzr_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzvvzo_required = true;
+			jform_vvvvvzyvzr_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_vvvvvzvvzp_required)
+		if (!jform_vvvvvzyvzs_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzvvzp_required = true;
+			jform_vvvvvzyvzs_required = true;
 		}
 	}
 }
 
-// the vvvvvzw function
-function vvvvvzw(target_vvvvvzw,type_vvvvvzw)
+// the vvvvvzz function
+function vvvvvzz(target_vvvvvzz,type_vvvvvzz)
 {
 	// set the function logic
-	if (target_vvvvvzw == 1 && type_vvvvvzw == 1)
+	if (target_vvvvvzz == 1 && type_vvvvvzz == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzw(target_vvvvvzw,type_vvvvvzw)
 	}
 }
 
-// the vvvvvzx function
-function vvvvvzx(type_vvvvvzx,target_vvvvvzx)
+// the vvvvwaa function
+function vvvvwaa(type_vvvvwaa,target_vvvvwaa)
 {
 	// set the function logic
-	if (type_vvvvvzx == 1 && target_vvvvvzx == 1)
+	if (type_vvvvwaa == 1 && target_vvvvwaa == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/dynamic_get.js

@@ -23,24 +23,26 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyyvyu_required = false;
-jform_vvvvvyzvyv_required = false;
-jform_vvvvvzavyw_required = false;
-jform_vvvvvzbvyx_required = false;
-jform_vvvvvzcvyy_required = false;
-jform_vvvvvzdvyz_required = false;
-jform_vvvvvzivza_required = false;
-jform_vvvvvzkvzb_required = false;
-jform_vvvvvzlvzc_required = false;
-jform_vvvvvznvzd_required = false;
+jform_vvvvvyyvyv_required = false;
+jform_vvvvvyzvyw_required = false;
+jform_vvvvvzavyx_required = false;
+jform_vvvvvzbvyy_required = false;
+jform_vvvvvzcvyz_required = false;
+jform_vvvvvzdvza_required = false;
+jform_vvvvvzivzb_required = false;
+jform_vvvvvzkvzc_required = false;
+jform_vvvvvzlvzd_required = false;
 jform_vvvvvznvze_required = false;
-jform_vvvvvzovzf_required = false;
-jform_vvvvvzpvzg_required = false;
-jform_vvvvvzqvzh_required = false;
-jform_vvvvvzsvzi_required = false;
+jform_vvvvvznvzf_required = false;
+jform_vvvvvzovzg_required = false;
+jform_vvvvvzpvzh_required = false;
+jform_vvvvvzqvzi_required = false;
 jform_vvvvvzsvzj_required = false;
 jform_vvvvvzsvzk_required = false;
-jform_vvvvvztvzl_required = false;
+jform_vvvvvzsvzl_required = false;
+jform_vvvvvztvzm_required = false;
+jform_vvvvvzuvzn_required = false;
+jform_vvvvvzvvzo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -105,6 +107,13 @@ jQuery(document).ready(function()
 
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
 	vvvvvzt(gettype_vvvvvzt);
+
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(gettype_vvvvvzu);
+
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
 });
 
 // the vvvvvyy function
@@ -127,26 +136,26 @@ function vvvvvyy(gettype_vvvvvyy)
 	if (gettype)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
-		if (jform_vvvvvyyvyu_required)
+		if (jform_vvvvvyyvyv_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvyyvyu_required = false;
+			jform_vvvvvyyvyv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
-		if (!jform_vvvvvyyvyu_required)
+		if (!jform_vvvvvyyvyv_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvyyvyu_required = true;
+			jform_vvvvvyyvyv_required = true;
 		}
 	}
 }
@@ -182,26 +191,26 @@ function vvvvvyz(main_source_vvvvvyz)
 	if (main_source)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
-		if (jform_vvvvvyzvyv_required)
+		if (jform_vvvvvyzvyw_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvyzvyv_required = false;
+			jform_vvvvvyzvyw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvyzvyv_required)
+		if (!jform_vvvvvyzvyw_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvyzvyv_required = true;
+			jform_vvvvvyzvyw_required = true;
 		}
 	}
 }
@@ -237,26 +246,26 @@ function vvvvvza(main_source_vvvvvza)
 	if (main_source)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
-		if (jform_vvvvvzavyw_required)
+		if (jform_vvvvvzavyx_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvvzavyw_required = false;
+			jform_vvvvvzavyx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzavyw_required)
+		if (!jform_vvvvvzavyx_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvvzavyw_required = true;
+			jform_vvvvvzavyx_required = true;
 		}
 	}
 }
@@ -292,26 +301,26 @@ function vvvvvzb(main_source_vvvvvzb)
 	if (main_source)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
-		if (jform_vvvvvzbvyx_required)
+		if (jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvvzbvyx_required = false;
+			jform_vvvvvzbvyy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvzbvyx_required)
+		if (!jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvvzbvyx_required = true;
+			jform_vvvvvzbvyy_required = true;
 		}
 	}
 }
@@ -347,26 +356,26 @@ function vvvvvzc(main_source_vvvvvzc)
 	if (main_source)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
-		if (jform_vvvvvzcvyy_required)
+		if (jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvvzcvyy_required = false;
+			jform_vvvvvzcvyz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzcvyy_required)
+		if (!jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvvzcvyy_required = true;
+			jform_vvvvvzcvyz_required = true;
 		}
 	}
 }
@@ -389,26 +398,26 @@ function vvvvvzd(addcalculation_vvvvvzd)
 	if (addcalculation_vvvvvzd == 1)
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').show();
-		if (jform_vvvvvzdvyz_required)
+		if (jform_vvvvvzdvza_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzdvyz_required = false;
+			jform_vvvvvzdvza_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').hide();
-		if (!jform_vvvvvzdvyz_required)
+		if (!jform_vvvvvzdvza_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzdvyz_required = true;
+			jform_vvvvvzdvza_required = true;
 		}
 	}
 }
@@ -555,26 +564,26 @@ function vvvvvzi(main_source_vvvvvzi)
 	if (main_source)
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').show();
-		if (jform_vvvvvzivza_required)
+		if (jform_vvvvvzivzb_required)
 		{
 			updateFieldRequired('php_custom_get',0);
 			jQuery('#jform_php_custom_get').prop('required','required');
 			jQuery('#jform_php_custom_get').attr('aria-required',true);
 			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzivza_required = false;
+			jform_vvvvvzivzb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').hide();
-		if (!jform_vvvvvzivza_required)
+		if (!jform_vvvvvzivzb_required)
 		{
 			updateFieldRequired('php_custom_get',1);
 			jQuery('#jform_php_custom_get').removeAttr('required');
 			jQuery('#jform_php_custom_get').removeAttr('aria-required');
 			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzivza_required = true;
+			jform_vvvvvzivzb_required = true;
 		}
 	}
 }
@@ -670,26 +679,26 @@ function vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk)
 	if (add_php_before_getitem && gettype)
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzkvzb_required)
+		if (jform_vvvvvzkvzc_required)
 		{
 			updateFieldRequired('php_before_getitem',0);
 			jQuery('#jform_php_before_getitem').prop('required','required');
 			jQuery('#jform_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzkvzb_required = false;
+			jform_vvvvvzkvzc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzkvzb_required)
+		if (!jform_vvvvvzkvzc_required)
 		{
 			updateFieldRequired('php_before_getitem',1);
 			jQuery('#jform_php_before_getitem').removeAttr('required');
 			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzkvzb_required = true;
+			jform_vvvvvzkvzc_required = true;
 		}
 	}
 }
@@ -748,26 +757,26 @@ function vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl)
 	if (add_php_after_getitem && gettype)
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzlvzc_required)
+		if (jform_vvvvvzlvzd_required)
 		{
 			updateFieldRequired('php_after_getitem',0);
 			jQuery('#jform_php_after_getitem').prop('required','required');
 			jQuery('#jform_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_php_after_getitem').addClass('required');
-			jform_vvvvvzlvzc_required = false;
+			jform_vvvvvzlvzd_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzlvzc_required)
+		if (!jform_vvvvvzlvzd_required)
 		{
 			updateFieldRequired('php_after_getitem',1);
 			jQuery('#jform_php_after_getitem').removeAttr('required');
 			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitem').removeClass('required');
-			jform_vvvvvzlvzc_required = true;
+			jform_vvvvvzlvzd_required = true;
 		}
 	}
 }
@@ -814,45 +823,45 @@ function vvvvvzn(gettype_vvvvvzn)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvznvzd_required)
+		if (jform_vvvvvznvze_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvznvzd_required = false;
+			jform_vvvvvznvze_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvznvze_required)
+		if (jform_vvvvvznvzf_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvznvze_required = false;
+			jform_vvvvvznvzf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvznvzd_required)
+		if (!jform_vvvvvznvze_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvznvzd_required = true;
+			jform_vvvvvznvze_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvznvze_required)
+		if (!jform_vvvvvznvzf_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvznvze_required = true;
+			jform_vvvvvznvzf_required = true;
 		}
 	}
 }
@@ -900,26 +909,26 @@ function vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo)
 	if (add_php_getlistquery && gettype)
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzovzf_required)
+		if (jform_vvvvvzovzg_required)
 		{
 			updateFieldRequired('php_getlistquery',0);
 			jQuery('#jform_php_getlistquery').prop('required','required');
 			jQuery('#jform_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_php_getlistquery').addClass('required');
-			jform_vvvvvzovzf_required = false;
+			jform_vvvvvzovzg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzovzf_required)
+		if (!jform_vvvvvzovzg_required)
 		{
 			updateFieldRequired('php_getlistquery',1);
 			jQuery('#jform_php_getlistquery').removeAttr('required');
 			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_php_getlistquery').removeClass('required');
-			jform_vvvvvzovzf_required = true;
+			jform_vvvvvzovzg_required = true;
 		}
 	}
 }
@@ -978,26 +987,26 @@ function vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp)
 	if (add_php_before_getitems && gettype)
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzpvzg_required)
+		if (jform_vvvvvzpvzh_required)
 		{
 			updateFieldRequired('php_before_getitems',0);
 			jQuery('#jform_php_before_getitems').prop('required','required');
 			jQuery('#jform_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_php_before_getitems').addClass('required');
-			jform_vvvvvzpvzg_required = false;
+			jform_vvvvvzpvzh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzg_required)
+		if (!jform_vvvvvzpvzh_required)
 		{
 			updateFieldRequired('php_before_getitems',1);
 			jQuery('#jform_php_before_getitems').removeAttr('required');
 			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitems').removeClass('required');
-			jform_vvvvvzpvzg_required = true;
+			jform_vvvvvzpvzh_required = true;
 		}
 	}
 }
@@ -1056,26 +1065,26 @@ function vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq)
 	if (add_php_after_getitems && gettype)
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzqvzh_required)
+		if (jform_vvvvvzqvzi_required)
 		{
 			updateFieldRequired('php_after_getitems',0);
 			jQuery('#jform_php_after_getitems').prop('required','required');
 			jQuery('#jform_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_php_after_getitems').addClass('required');
-			jform_vvvvvzqvzh_required = false;
+			jform_vvvvvzqvzi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzqvzh_required)
+		if (!jform_vvvvvzqvzi_required)
 		{
 			updateFieldRequired('php_after_getitems',1);
 			jQuery('#jform_php_after_getitems').removeAttr('required');
 			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitems').removeClass('required');
-			jform_vvvvvzqvzh_required = true;
+			jform_vvvvvzqvzi_required = true;
 		}
 	}
 }
@@ -1122,64 +1131,64 @@ function vvvvvzs(gettype_vvvvvzs)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzsvzi_required)
+		if (jform_vvvvvzsvzj_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvvzsvzi_required = false;
+			jform_vvvvvzsvzj_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzsvzj_required)
+		if (jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvvzsvzj_required = false;
+			jform_vvvvvzsvzk_required = false;
 		}
 
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzsvzk_required)
+		if (jform_vvvvvzsvzl_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvvzsvzk_required = false;
+			jform_vvvvvzsvzl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzi_required)
+		if (!jform_vvvvvzsvzj_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvvzsvzi_required = true;
+			jform_vvvvvzsvzj_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzj_required)
+		if (!jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvvzsvzj_required = true;
+			jform_vvvvvzsvzk_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzk_required)
+		if (!jform_vvvvvzsvzl_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvvzsvzk_required = true;
+			jform_vvvvvzsvzl_required = true;
 		}
 	}
 }
@@ -1215,26 +1224,26 @@ function vvvvvzt(gettype_vvvvvzt)
 	if (gettype)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
-		if (jform_vvvvvztvzl_required)
+		if (jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvvztvzl_required = false;
+			jform_vvvvvztvzm_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
-		if (!jform_vvvvvztvzl_required)
+		if (!jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvvztvzl_required = true;
+			jform_vvvvvztvzm_required = true;
 		}
 	}
 }
@@ -1250,6 +1259,139 @@ function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt)
 	return false;
 }
 
+// the vvvvvzu function
+function vvvvvzu(gettype_vvvvvzu)
+{
+	if (isSet(gettype_vvvvvzu) && gettype_vvvvvzu.constructor !== Array)
+	{
+		var temp_vvvvvzu = gettype_vvvvvzu;
+		var gettype_vvvvvzu = [];
+		gettype_vvvvvzu.push(temp_vvvvvzu);
+	}
+	else if (!isSet(gettype_vvvvvzu))
+	{
+		var gettype_vvvvvzu = [];
+	}
+	var gettype = gettype_vvvvvzu.some(gettype_vvvvvzu_SomeFunc);
+
+
+	// set this function logic
+	if (gettype)
+	{
+		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
+		if (jform_vvvvvzuvzn_required)
+		{
+			updateFieldRequired('add_php_router_parse',0);
+			jQuery('#jform_add_php_router_parse').prop('required','required');
+			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_add_php_router_parse').addClass('required');
+			jform_vvvvvzuvzn_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
+		if (!jform_vvvvvzuvzn_required)
+		{
+			updateFieldRequired('add_php_router_parse',1);
+			jQuery('#jform_add_php_router_parse').removeAttr('required');
+			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_add_php_router_parse').removeClass('required');
+			jform_vvvvvzuvzn_required = true;
+		}
+	}
+}
+
+// the vvvvvzu Some function
+function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu)
+{
+	// set the function logic
+	if (gettype_vvvvvzu == 1 || gettype_vvvvvzu == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzv function
+function vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv)
+{
+	if (isSet(gettype_vvvvvzv) && gettype_vvvvvzv.constructor !== Array)
+	{
+		var temp_vvvvvzv = gettype_vvvvvzv;
+		var gettype_vvvvvzv = [];
+		gettype_vvvvvzv.push(temp_vvvvvzv);
+	}
+	else if (!isSet(gettype_vvvvvzv))
+	{
+		var gettype_vvvvvzv = [];
+	}
+	var gettype = gettype_vvvvvzv.some(gettype_vvvvvzv_SomeFunc);
+
+	if (isSet(add_php_router_parse_vvvvvzv) && add_php_router_parse_vvvvvzv.constructor !== Array)
+	{
+		var temp_vvvvvzv = add_php_router_parse_vvvvvzv;
+		var add_php_router_parse_vvvvvzv = [];
+		add_php_router_parse_vvvvvzv.push(temp_vvvvvzv);
+	}
+	else if (!isSet(add_php_router_parse_vvvvvzv))
+	{
+		var add_php_router_parse_vvvvvzv = [];
+	}
+	var add_php_router_parse = add_php_router_parse_vvvvvzv.some(add_php_router_parse_vvvvvzv_SomeFunc);
+
+
+	// set this function logic
+	if (gettype && add_php_router_parse)
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').show();
+		if (jform_vvvvvzvvzo_required)
+		{
+			updateFieldRequired('php_router_parse',0);
+			jQuery('#jform_php_router_parse').prop('required','required');
+			jQuery('#jform_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_php_router_parse').addClass('required');
+			jform_vvvvvzvvzo_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').hide();
+		if (!jform_vvvvvzvvzo_required)
+		{
+			updateFieldRequired('php_router_parse',1);
+			jQuery('#jform_php_router_parse').removeAttr('required');
+			jQuery('#jform_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_php_router_parse').removeClass('required');
+			jform_vvvvvzvvzo_required = true;
+		}
+	}
+}
+
+// the vvvvvzv Some function
+function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
+{
+	// set the function logic
+	if (gettype_vvvvvzv == 1 || gettype_vvvvvzv == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzv Some function
+function add_php_router_parse_vvvvvzv_SomeFunc(add_php_router_parse_vvvvvzv)
+{
+	// set the function logic
+	if (add_php_router_parse_vvvvvzv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
 // update required fields
 function updateFieldRequired(name,status)
 {
@@ -1290,6 +1432,8 @@ jQuery(document).ready(function()
 {
 	// get the linked details
 	getLinked();
+	var valueSwitch = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	getDynamicScripts(valueSwitch);
 });
 			
 function getLinked_server(type){
@@ -1433,4 +1577,33 @@ function updateSubItems(fieldName, fieldNr, table_, nr_){
 			}
 		});
 	}
+}
+
+function getDynamicScripts_server(typpe){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && typpe.length > 0){
+		var request = 'token='+token+'&type='+typpe;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+function getDynamicScripts(id){
+	if (1 == id) {
+		// get the current values
+		var current_router_parse = jQuery('textarea#jform_php_router_parse').val();
+		// set the router parse method script
+		if(current_router_parse.length == 0){
+			getDynamicScripts_server('routerparse').done(function(result) {
+				if(result){
+					jQuery('textarea#jform_php_router_parse').val(result);
+				}
+			});
+		}
+	}
 } 

admin/models/forms/dynamic_get.xml

@@ -143,11 +143,18 @@
                        filter="HTML"
                        hint="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_HINT"
                        required="true" />
-                <!-- Note_calculation_items Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_calculation_items"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
-                       class="note_calculation_items" />
+                <!-- Addcalculation Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="addcalculation"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
+                </field>
                 <!-- Php_custom_get Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_custom_get"
@@ -177,182 +184,13 @@
                        description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
                        heading="h4"
                        class="note_linked_to_notice" />
-                <!-- Join_view_table Field. Type: Subform. (joomla)-->
-                <field type="subform"
-                       name="join_view_table"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
-                       multiple="true"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
-                       icon="list"
-                       maximum="50">
-                        <form hidden="true"
-                              name="list_join_view_table_modal"
-                              repeat="true">
-                                <!-- View_table Field. Type: Adminviews. (custom)-->
-                                <field type="adminviews"
-                                       name="view_table"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
-                                       multiple="false"
-                                       required="false"
-                                       button="false" />
-                                <!-- Row_type Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="row_type"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
-                                       class="list_class fieldMedium"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="1">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
-                                </field>
-                                <!-- As Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="as"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
-                                       class="list_class fieldSmall"
-                                       multiple="false"
-                                       filter="WORD"
-                                       required="false"
-                                       default="b">
-                                        <!-- Option Set.-->
-                                        <option value="b">COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
-                                        <option value="c">COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
-                                        <option value="d">COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
-                                        <option value="e">COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
-                                        <option value="f">COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
-                                        <option value="g">COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
-                                        <option value="h">COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
-                                        <option value="i">COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
-                                        <option value="j">COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
-                                        <option value="k">COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
-                                        <option value="l">COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
-                                        <option value="m">COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
-                                        <option value="n">COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
-                                        <option value="o">COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
-                                        <option value="p">COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
-                                        <option value="q">COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
-                                        <option value="r">COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
-                                        <option value="s">COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
-                                        <option value="t">COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
-                                        <option value="u">COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
-                                        <option value="v">COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
-                                        <option value="w">COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
-                                        <option value="x">COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
-                                        <option value="y">COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
-                                        <option value="z">COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
-                                        <option value="aa">COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
-                                        <option value="bb">COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
-                                        <option value="cc">COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
-                                        <option value="dd">COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
-                                        <option value="ee">COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
-                                        <option value="ff">COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
-                                        <option value="gg">COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
-                                        <option value="hh">COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
-                                        <option value="ii">COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
-                                        <option value="jj">COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
-                                        <option value="kk">COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
-                                        <option value="ll">COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
-                                        <option value="mm">COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
-                                        <option value="nn">COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
-                                        <option value="oo">COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
-                                        <option value="pp">COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
-                                        <option value="qq">COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
-                                        <option value="rr">COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
-                                        <option value="ss">COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
-                                        <option value="tt">COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
-                                        <option value="uu">COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
-                                        <option value="vv">COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
-                                        <option value="ww">COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
-                                        <option value="xx">COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
-                                        <option value="yy">COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
-                                        <option value="zz">COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
-                                </field>
-                                <!-- Type Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="type"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
-                                       class="list_class fieldMedium"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="1">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
-                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
-                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
-                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
-                                </field>
-                                <!-- On_field Field. Type: Text. (joomla)-->
-                                <field type="text"
-                                       name="on_field"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
-                                       size="40"
-                                       maxlength="150"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
-                                       class="text_area fieldMedium"
-                                       readonly="false"
-                                       disabled="false"
-                                       required="false"
-                                       filter="CMD"
-                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT" />
-                                <!-- Operator Field. Type: List. (joomla)-->
-                                <field type="list"
-                                       name="operator"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
-                                       class="list_class fieldMedium"
-                                       multiple="false"
-                                       filter="INT"
-                                       required="false"
-                                       default="0">
-                                        <!-- Option Set.-->
-                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
-                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
-                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
-                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
-                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
-                                        <option value="6">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
-                                        <option value="7">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
-                                        <option value="8">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
-                                        <option value="9">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
-                                        <option value="10">COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
-                                        <option value="11">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
-                                </field>
-                                <!-- Join_field Field. Type: Text. (joomla)-->
-                                <field type="text"
-                                       name="join_field"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
-                                       size="40"
-                                       maxlength="150"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
-                                       class="text_area fieldMedium"
-                                       readonly="false"
-                                       disabled="false"
-                                       required="false"
-                                       filter="CMD"
-                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT" />
-                                <!-- Selection Field. Type: Textarea. (joomla)-->
-                                <field type="textarea"
-                                       name="selection"
-                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
-                                       rows="22"
-                                       cols="30"
-                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
-                                       class="text_area span12"
-                                       filter="HTML"
-                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
-                                       required="false" />
-                        </form>
-                </field>
+                <!-- View_table_main Field. Type: Adminviews. (custom)-->
+                <field type="adminviews"
+                       name="view_table_main"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+                       multiple="false"
+                       required="true" />
                 <!-- View_selection Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="view_selection"
@@ -386,11 +224,11 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- Addcalculation Field. Type: Radio. (joomla)-->
+                <!-- Add_php_router_parse Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="addcalculation"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_DESCRIPTION"
+                       name="add_php_router_parse"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE_DESCRIPTION"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -409,13 +247,11 @@
                         <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
                 </field>
-                <!-- View_table_main Field. Type: Adminviews. (custom)-->
-                <field type="adminviews"
-                       name="view_table_main"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
-                       multiple="false"
-                       required="true" />
+                <!-- Note_calculation_items Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_calculation_items"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
+                       class="note_calculation_items" />
                 <!-- Add_php_getlistquery Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_getlistquery"
@@ -882,11 +718,17 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Note_calculation_item Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_calculation_item"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION"
-                       class="note_calculation_item" />
+                <!-- Php_router_parse Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_router_parse"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_HINT"
+                       required="true" />
                 <!-- Global Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="global"
@@ -1002,6 +844,187 @@
                                 </field>
                         </form>
                 </field>
+                <!-- Note_calculation_item Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_calculation_item"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION"
+                       class="note_calculation_item" />
+                <!-- Join_view_table Field. Type: Subform. (joomla)-->
+                <field type="subform"
+                       name="join_view_table"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL"
+                       layout="joomla.form.field.subform.repeatable-table"
+                       multiple="true"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
+                       icon="list"
+                       maximum="50">
+                        <form hidden="true"
+                              name="list_join_view_table_modal"
+                              repeat="true">
+                                <!-- View_table Field. Type: Adminviews. (custom)-->
+                                <field type="adminviews"
+                                       name="view_table"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
+                                       multiple="false"
+                                       required="false"
+                                       button="false" />
+                                <!-- Row_type Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="row_type"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="1">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
+                                </field>
+                                <!-- As Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="as"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
+                                       class="list_class fieldSmall"
+                                       multiple="false"
+                                       filter="WORD"
+                                       required="false"
+                                       default="b">
+                                        <!-- Option Set.-->
+                                        <option value="b">COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
+                                        <option value="c">COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
+                                        <option value="d">COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
+                                        <option value="e">COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
+                                        <option value="f">COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
+                                        <option value="g">COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
+                                        <option value="h">COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
+                                        <option value="i">COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
+                                        <option value="j">COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
+                                        <option value="k">COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
+                                        <option value="l">COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
+                                        <option value="m">COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
+                                        <option value="n">COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
+                                        <option value="o">COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
+                                        <option value="p">COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
+                                        <option value="q">COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
+                                        <option value="r">COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
+                                        <option value="s">COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
+                                        <option value="t">COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
+                                        <option value="u">COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
+                                        <option value="v">COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
+                                        <option value="w">COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
+                                        <option value="x">COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
+                                        <option value="y">COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
+                                        <option value="z">COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
+                                        <option value="aa">COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
+                                        <option value="bb">COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
+                                        <option value="cc">COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
+                                        <option value="dd">COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
+                                        <option value="ee">COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
+                                        <option value="ff">COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
+                                        <option value="gg">COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
+                                        <option value="hh">COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
+                                        <option value="ii">COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
+                                        <option value="jj">COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
+                                        <option value="kk">COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
+                                        <option value="ll">COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
+                                        <option value="mm">COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
+                                        <option value="nn">COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
+                                        <option value="oo">COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
+                                        <option value="pp">COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
+                                        <option value="qq">COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
+                                        <option value="rr">COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
+                                        <option value="ss">COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
+                                        <option value="tt">COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
+                                        <option value="uu">COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
+                                        <option value="vv">COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
+                                        <option value="ww">COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
+                                        <option value="xx">COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
+                                        <option value="yy">COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
+                                        <option value="zz">COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
+                                </field>
+                                <!-- Type Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="type"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="1">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
+                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
+                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
+                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
+                                </field>
+                                <!-- On_field Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="on_field"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
+                                       class="text_area fieldMedium"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="CMD"
+                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT" />
+                                <!-- Operator Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="operator"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
+                                       class="list_class fieldMedium"
+                                       multiple="false"
+                                       filter="INT"
+                                       required="false"
+                                       default="0">
+                                        <!-- Option Set.-->
+                                        <option value="1">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
+                                        <option value="2">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
+                                        <option value="3">COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
+                                        <option value="4">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
+                                        <option value="5">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
+                                        <option value="6">COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
+                                        <option value="7">COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
+                                        <option value="8">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
+                                        <option value="9">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
+                                        <option value="10">COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
+                                        <option value="11">COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
+                                </field>
+                                <!-- Join_field Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="join_field"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
+                                       class="text_area fieldMedium"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="CMD"
+                                       message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT" />
+                                <!-- Selection Field. Type: Textarea. (joomla)-->
+                                <field type="textarea"
+                                       name="selection"
+                                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
+                                       rows="22"
+                                       cols="30"
+                                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
+                                       class="text_area span12"
+                                       filter="HTML"
+                                       hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
+                                       required="false" />
+                        </form>
+                </field>
                 <!-- Php_calculation Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_calculation"

admin/models/forms/field.js

@@ -23,171 +23,171 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwagvzs_required = false;
-jform_vvvvwahvzt_required = false;
-jform_vvvvwaivzu_required = false;
 jform_vvvvwajvzv_required = false;
-jform_vvvvwamvzw_required = false;
-jform_vvvvwanvzx_required = false;
-jform_vvvvwaovzy_required = false;
+jform_vvvvwakvzw_required = false;
+jform_vvvvwalvzx_required = false;
+jform_vvvvwamvzy_required = false;
 jform_vvvvwapvzz_required = false;
+jform_vvvvwaqwaa_required = false;
+jform_vvvvwarwab_required = false;
+jform_vvvvwaswac_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	vvvvwaj(datalenght_vvvvwaj);
 
-	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	vvvvwak(datadefault_vvvvwak);
 
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
+	vvvvwal(datatype_vvvvwal);
 
-	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
+	vvvvwam(datatype_vvvvwam);
 
-	var store_vvvvwak = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	var store_vvvvwan = jQuery("#jform_store").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
-	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwap(add_css_view_vvvvwap);
 
-	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaq(add_css_views_vvvvwaq);
 
-	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwar(add_javascript_view_footer_vvvvwar);
 
-	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwas(add_javascript_views_footer_vvvvwas);
 });
 
-// the vvvvwag function
-function vvvvwag(datalenght_vvvvwag)
+// the vvvvwaj function
+function vvvvwaj(datalenght_vvvvwaj)
 {
-	if (isSet(datalenght_vvvvwag) && datalenght_vvvvwag.constructor !== Array)
+	if (isSet(datalenght_vvvvwaj) && datalenght_vvvvwaj.constructor !== Array)
 	{
-		var temp_vvvvwag = datalenght_vvvvwag;
-		var datalenght_vvvvwag = [];
-		datalenght_vvvvwag.push(temp_vvvvwag);
+		var temp_vvvvwaj = datalenght_vvvvwaj;
+		var datalenght_vvvvwaj = [];
+		datalenght_vvvvwaj.push(temp_vvvvwaj);
 	}
-	else if (!isSet(datalenght_vvvvwag))
+	else if (!isSet(datalenght_vvvvwaj))
 	{
-		var datalenght_vvvvwag = [];
+		var datalenght_vvvvwaj = [];
 	}
-	var datalenght = datalenght_vvvvwag.some(datalenght_vvvvwag_SomeFunc);
+	var datalenght = datalenght_vvvvwaj.some(datalenght_vvvvwaj_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwagvzs_required)
+		if (jform_vvvvwajvzv_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_vvvvwagvzs_required = false;
+			jform_vvvvwajvzv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwagvzs_required)
+		if (!jform_vvvvwajvzv_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_vvvvwagvzs_required = true;
+			jform_vvvvwajvzv_required = true;
 		}
 	}
 }
 
-// the vvvvwag Some function
-function datalenght_vvvvwag_SomeFunc(datalenght_vvvvwag)
+// the vvvvwaj Some function
+function datalenght_vvvvwaj_SomeFunc(datalenght_vvvvwaj)
 {
 	// set the function logic
-	if (datalenght_vvvvwag == 'Other')
+	if (datalenght_vvvvwaj == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwah function
-function vvvvwah(datadefault_vvvvwah)
+// the vvvvwak function
+function vvvvwak(datadefault_vvvvwak)
 {
-	if (isSet(datadefault_vvvvwah) && datadefault_vvvvwah.constructor !== Array)
+	if (isSet(datadefault_vvvvwak) && datadefault_vvvvwak.constructor !== Array)
 	{
-		var temp_vvvvwah = datadefault_vvvvwah;
-		var datadefault_vvvvwah = [];
-		datadefault_vvvvwah.push(temp_vvvvwah);
+		var temp_vvvvwak = datadefault_vvvvwak;
+		var datadefault_vvvvwak = [];
+		datadefault_vvvvwak.push(temp_vvvvwak);
 	}
-	else if (!isSet(datadefault_vvvvwah))
+	else if (!isSet(datadefault_vvvvwak))
 	{
-		var datadefault_vvvvwah = [];
+		var datadefault_vvvvwak = [];
 	}
-	var datadefault = datadefault_vvvvwah.some(datadefault_vvvvwah_SomeFunc);
+	var datadefault = datadefault_vvvvwak.some(datadefault_vvvvwak_SomeFunc);
 
 
 	// set this function logic
 	if (datadefault)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwahvzt_required)
+		if (jform_vvvvwakvzw_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwahvzt_required = false;
+			jform_vvvvwakvzw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwahvzt_required)
+		if (!jform_vvvvwakvzw_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwahvzt_required = true;
+			jform_vvvvwakvzw_required = true;
 		}
 	}
 }
 
-// the vvvvwah Some function
-function datadefault_vvvvwah_SomeFunc(datadefault_vvvvwah)
+// the vvvvwak Some function
+function datadefault_vvvvwak_SomeFunc(datadefault_vvvvwak)
 {
 	// set the function logic
-	if (datadefault_vvvvwah == 'Other')
+	if (datadefault_vvvvwak == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwai function
-function vvvvwai(datatype_vvvvwai)
+// the vvvvwal function
+function vvvvwal(datatype_vvvvwal)
 {
-	if (isSet(datatype_vvvvwai) && datatype_vvvvwai.constructor !== Array)
+	if (isSet(datatype_vvvvwal) && datatype_vvvvwal.constructor !== Array)
 	{
-		var temp_vvvvwai = datatype_vvvvwai;
-		var datatype_vvvvwai = [];
-		datatype_vvvvwai.push(temp_vvvvwai);
+		var temp_vvvvwal = datatype_vvvvwal;
+		var datatype_vvvvwal = [];
+		datatype_vvvvwal.push(temp_vvvvwal);
 	}
-	else if (!isSet(datatype_vvvvwai))
+	else if (!isSet(datatype_vvvvwal))
 	{
-		var datatype_vvvvwai = [];
+		var datatype_vvvvwal = [];
 	}
-	var datatype = datatype_vvvvwai.some(datatype_vvvvwai_SomeFunc);
+	var datatype = datatype_vvvvwal.some(datatype_vvvvwal_SomeFunc);
 
 
 	// set this function logic
@@ -196,13 +196,13 @@ function vvvvwai(datatype_vvvvwai)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwaivzu_required)
+		if (jform_vvvvwalvzx_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwaivzu_required = false;
+			jform_vvvvwalvzx_required = false;
 		}
 
 	}
@@ -211,109 +211,109 @@ function vvvvwai(datatype_vvvvwai)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvwaivzu_required)
+		if (!jform_vvvvwalvzx_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwaivzu_required = true;
+			jform_vvvvwalvzx_required = true;
 		}
 	}
 }
 
-// the vvvvwai Some function
-function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+// the vvvvwal Some function
+function datatype_vvvvwal_SomeFunc(datatype_vvvvwal)
 {
 	// set the function logic
-	if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'DATETIME' || datatype_vvvvwai == 'DATE' || datatype_vvvvwai == 'TIME' || datatype_vvvvwai == 'INT' || datatype_vvvvwai == 'TINYINT' || datatype_vvvvwai == 'BIGINT' || datatype_vvvvwai == 'FLOAT' || datatype_vvvvwai == 'DECIMAL' || datatype_vvvvwai == 'DOUBLE')
+	if (datatype_vvvvwal == 'CHAR' || datatype_vvvvwal == 'VARCHAR' || datatype_vvvvwal == 'DATETIME' || datatype_vvvvwal == 'DATE' || datatype_vvvvwal == 'TIME' || datatype_vvvvwal == 'INT' || datatype_vvvvwal == 'TINYINT' || datatype_vvvvwal == 'BIGINT' || datatype_vvvvwal == 'FLOAT' || datatype_vvvvwal == 'DECIMAL' || datatype_vvvvwal == 'DOUBLE')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwaj function
-function vvvvwaj(datatype_vvvvwaj)
+// the vvvvwam function
+function vvvvwam(datatype_vvvvwam)
 {
-	if (isSet(datatype_vvvvwaj) && datatype_vvvvwaj.constructor !== Array)
+	if (isSet(datatype_vvvvwam) && datatype_vvvvwam.constructor !== Array)
 	{
-		var temp_vvvvwaj = datatype_vvvvwaj;
-		var datatype_vvvvwaj = [];
-		datatype_vvvvwaj.push(temp_vvvvwaj);
+		var temp_vvvvwam = datatype_vvvvwam;
+		var datatype_vvvvwam = [];
+		datatype_vvvvwam.push(temp_vvvvwam);
 	}
-	else if (!isSet(datatype_vvvvwaj))
+	else if (!isSet(datatype_vvvvwam))
 	{
-		var datatype_vvvvwaj = [];
+		var datatype_vvvvwam = [];
 	}
-	var datatype = datatype_vvvvwaj.some(datatype_vvvvwaj_SomeFunc);
+	var datatype = datatype_vvvvwam.some(datatype_vvvvwam_SomeFunc);
 
 
 	// set this function logic
 	if (datatype)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
-		if (jform_vvvvwajvzv_required)
+		if (jform_vvvvwamvzy_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwajvzv_required = false;
+			jform_vvvvwamvzy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvwajvzv_required)
+		if (!jform_vvvvwamvzy_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwajvzv_required = true;
+			jform_vvvvwamvzy_required = true;
 		}
 	}
 }
 
-// the vvvvwaj Some function
-function datatype_vvvvwaj_SomeFunc(datatype_vvvvwaj)
+// the vvvvwam Some function
+function datatype_vvvvwam_SomeFunc(datatype_vvvvwam)
 {
 	// set the function logic
-	if (datatype_vvvvwaj == 'CHAR' || datatype_vvvvwaj == 'VARCHAR' || datatype_vvvvwaj == 'TEXT' || datatype_vvvvwaj == 'MEDIUMTEXT' || datatype_vvvvwaj == 'LONGTEXT')
+	if (datatype_vvvvwam == 'CHAR' || datatype_vvvvwam == 'VARCHAR' || datatype_vvvvwam == 'TEXT' || datatype_vvvvwam == 'MEDIUMTEXT' || datatype_vvvvwam == 'LONGTEXT')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwak function
-function vvvvwak(store_vvvvwak,datatype_vvvvwak)
+// the vvvvwan function
+function vvvvwan(store_vvvvwan,datatype_vvvvwan)
 {
-	if (isSet(store_vvvvwak) && store_vvvvwak.constructor !== Array)
+	if (isSet(store_vvvvwan) && store_vvvvwan.constructor !== Array)
 	{
-		var temp_vvvvwak = store_vvvvwak;
-		var store_vvvvwak = [];
-		store_vvvvwak.push(temp_vvvvwak);
+		var temp_vvvvwan = store_vvvvwan;
+		var store_vvvvwan = [];
+		store_vvvvwan.push(temp_vvvvwan);
 	}
-	else if (!isSet(store_vvvvwak))
+	else if (!isSet(store_vvvvwan))
 	{
-		var store_vvvvwak = [];
+		var store_vvvvwan = [];
 	}
-	var store = store_vvvvwak.some(store_vvvvwak_SomeFunc);
+	var store = store_vvvvwan.some(store_vvvvwan_SomeFunc);
 
-	if (isSet(datatype_vvvvwak) && datatype_vvvvwak.constructor !== Array)
+	if (isSet(datatype_vvvvwan) && datatype_vvvvwan.constructor !== Array)
 	{
-		var temp_vvvvwak = datatype_vvvvwak;
-		var datatype_vvvvwak = [];
-		datatype_vvvvwak.push(temp_vvvvwak);
+		var temp_vvvvwan = datatype_vvvvwan;
+		var datatype_vvvvwan = [];
+		datatype_vvvvwan.push(temp_vvvvwan);
 	}
-	else if (!isSet(datatype_vvvvwak))
+	else if (!isSet(datatype_vvvvwan))
 	{
-		var datatype_vvvvwak = [];
+		var datatype_vvvvwan = [];
 	}
-	var datatype = datatype_vvvvwak.some(datatype_vvvvwak_SomeFunc);
+	var datatype = datatype_vvvvwan.some(datatype_vvvvwan_SomeFunc);
 
 
 	// set this function logic
@@ -327,148 +327,148 @@ function vvvvwak(store_vvvvwak,datatype_vvvvwak)
 	}
 }
 
-// the vvvvwak Some function
-function store_vvvvwak_SomeFunc(store_vvvvwak)
+// the vvvvwan Some function
+function store_vvvvwan_SomeFunc(store_vvvvwan)
 {
 	// set the function logic
-	if (store_vvvvwak == 4)
+	if (store_vvvvwan == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwak Some function
-function datatype_vvvvwak_SomeFunc(datatype_vvvvwak)
+// the vvvvwan Some function
+function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
 {
 	// set the function logic
-	if (datatype_vvvvwak == 'CHAR' || datatype_vvvvwak == 'VARCHAR' || datatype_vvvvwak == 'TEXT' || datatype_vvvvwak == 'MEDIUMTEXT' || datatype_vvvvwak == 'LONGTEXT')
+	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'TEXT' || datatype_vvvvwan == 'MEDIUMTEXT' || datatype_vvvvwan == 'LONGTEXT')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwam function
-function vvvvwam(add_css_view_vvvvwam)
+// the vvvvwap function
+function vvvvwap(add_css_view_vvvvwap)
 {
 	// set the function logic
-	if (add_css_view_vvvvwam == 1)
+	if (add_css_view_vvvvwap == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwamvzw_required)
+		if (jform_vvvvwapvzz_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_vvvvwamvzw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwamvzw_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_vvvvwamvzw_required = true;
-		}
-	}
-}
-
-// the vvvvwan function
-function vvvvwan(add_css_views_vvvvwan)
-{
-	// set the function logic
-	if (add_css_views_vvvvwan == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwanvzx_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_vvvvwanvzx_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwanvzx_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_vvvvwanvzx_required = true;
-		}
-	}
-}
-
-// the vvvvwao function
-function vvvvwao(add_javascript_view_footer_vvvvwao)
-{
-	// set the function logic
-	if (add_javascript_view_footer_vvvvwao == 1)
-	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwaovzy_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_vvvvwaovzy_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaovzy_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_vvvvwaovzy_required = true;
-		}
-	}
-}
-
-// the vvvvwap function
-function vvvvwap(add_javascript_views_footer_vvvvwap)
-{
-	// set the function logic
-	if (add_javascript_views_footer_vvvvwap == 1)
-	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwapvzz_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_vvvvwapvzz_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_css_view').closest('.control-group').hide();
 		if (!jform_vvvvwapvzz_required)
+		{
+			updateFieldRequired('css_view',1);
+			jQuery('#jform_css_view').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeClass('required');
+			jform_vvvvwapvzz_required = true;
+		}
+	}
+}
+
+// the vvvvwaq function
+function vvvvwaq(add_css_views_vvvvwaq)
+{
+	// set the function logic
+	if (add_css_views_vvvvwaq == 1)
+	{
+		jQuery('#jform_css_views').closest('.control-group').show();
+		if (jform_vvvvwaqwaa_required)
+		{
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
+			jform_vvvvwaqwaa_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css_views').closest('.control-group').hide();
+		if (!jform_vvvvwaqwaa_required)
+		{
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
+			jform_vvvvwaqwaa_required = true;
+		}
+	}
+}
+
+// the vvvvwar function
+function vvvvwar(add_javascript_view_footer_vvvvwar)
+{
+	// set the function logic
+	if (add_javascript_view_footer_vvvvwar == 1)
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		if (jform_vvvvwarwab_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwarwab_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		if (!jform_vvvvwarwab_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwarwab_required = true;
+		}
+	}
+}
+
+// the vvvvwas function
+function vvvvwas(add_javascript_views_footer_vvvvwas)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwas == 1)
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		if (jform_vvvvwaswac_required)
+		{
+			updateFieldRequired('javascript_views_footer',0);
+			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_views_footer').addClass('required');
+			jform_vvvvwaswac_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		if (!jform_vvvvwaswac_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_vvvvwapvzz_required = true;
+			jform_vvvvwaswac_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -23,289 +23,289 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwaqwac_required = false;
-jform_vvvvwarwad_required = false;
-jform_vvvvwaswae_required = false;
 jform_vvvvwatwaf_required = false;
 jform_vvvvwauwag_required = false;
 jform_vvvvwavwah_required = false;
+jform_vvvvwawwai_required = false;
+jform_vvvvwaxwaj_required = false;
+jform_vvvvwaywak_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwaq(location_vvvvwaq);
+	var location_vvvvwat = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwat(location_vvvvwat);
 
-	var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwar(location_vvvvwar);
+	var location_vvvvwau = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwau(location_vvvvwau);
 
-	var type_vvvvwas = jQuery("#jform_type").val();
-	vvvvwas(type_vvvvwas);
+	var type_vvvvwav = jQuery("#jform_type").val();
+	vvvvwav(type_vvvvwav);
 
-	var type_vvvvwat = jQuery("#jform_type").val();
-	vvvvwat(type_vvvvwat);
+	var type_vvvvwaw = jQuery("#jform_type").val();
+	vvvvwaw(type_vvvvwaw);
 
-	var type_vvvvwau = jQuery("#jform_type").val();
-	vvvvwau(type_vvvvwau);
+	var type_vvvvwax = jQuery("#jform_type").val();
+	vvvvwax(type_vvvvwax);
 
-	var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwav(target_vvvvwav);
+	var target_vvvvway = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvway(target_vvvvway);
 });
 
-// the vvvvwaq function
-function vvvvwaq(location_vvvvwaq)
+// the vvvvwat function
+function vvvvwat(location_vvvvwat)
 {
 	// set the function logic
-	if (location_vvvvwaq == 1)
+	if (location_vvvvwat == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwaqwac_required)
+		if (jform_vvvvwatwaf_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_vvvvwaqwac_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwaqwac_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_vvvvwaqwac_required = true;
-		}
-	}
-}
-
-// the vvvvwar function
-function vvvvwar(location_vvvvwar)
-{
-	// set the function logic
-	if (location_vvvvwar == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwarwad_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_vvvvwarwad_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwarwad_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_vvvvwarwad_required = true;
-		}
-	}
-}
-
-// 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_url').closest('.control-group').show();
-		if (jform_vvvvwaswae_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaswae_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaswae_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwaswae_required = true;
-		}
-	}
-}
-
-// the vvvvwas Some function
-function type_vvvvwas_SomeFunc(type_vvvvwas)
-{
-	// set the function logic
-	if (type_vvvvwas == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwat function
-function vvvvwat(type_vvvvwat)
-{
-	if (isSet(type_vvvvwat) && type_vvvvwat.constructor !== Array)
-	{
-		var temp_vvvvwat = type_vvvvwat;
-		var type_vvvvwat = [];
-		type_vvvvwat.push(temp_vvvvwat);
-	}
-	else if (!isSet(type_vvvvwat))
-	{
-		var type_vvvvwat = [];
-	}
-	var type = type_vvvvwat.some(type_vvvvwat_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwatwaf_required)
-		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
 			jform_vvvvwatwaf_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwatwaf_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('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_vvvvwatwaf_required = true;
 		}
 	}
 }
 
-// the vvvvwat Some function
-function type_vvvvwat_SomeFunc(type_vvvvwat)
+// the vvvvwau function
+function vvvvwau(location_vvvvwau)
 {
 	// set the function logic
-	if (type_vvvvwat == 1)
+	if (location_vvvvwau == 2)
 	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwau function
-function vvvvwau(type_vvvvwau)
-{
-	if (isSet(type_vvvvwau) && type_vvvvwau.constructor !== Array)
-	{
-		var temp_vvvvwau = type_vvvvwau;
-		var type_vvvvwau = [];
-		type_vvvvwau.push(temp_vvvvwau);
-	}
-	else if (!isSet(type_vvvvwau))
-	{
-		var type_vvvvwau = [];
-	}
-	var type = type_vvvvwau.some(type_vvvvwau_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_site_view').closest('.control-group').show();
 		if (jform_vvvvwauwag_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('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_vvvvwauwag_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwauwag_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('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_vvvvwauwag_required = true;
 		}
 	}
 }
 
-// the vvvvwau Some function
-function type_vvvvwau_SomeFunc(type_vvvvwau)
-{
-	// set the function logic
-	if (type_vvvvwau == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwav function
-function vvvvwav(target_vvvvwav)
+function vvvvwav(type_vvvvwav)
 {
-	// set the function logic
-	if (target_vvvvwav == 1)
+	if (isSet(type_vvvvwav) && type_vvvvwav.constructor !== Array)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwav = type_vvvvwav;
+		var type_vvvvwav = [];
+		type_vvvvwav.push(temp_vvvvwav);
+	}
+	else if (!isSet(type_vvvvwav))
+	{
+		var type_vvvvwav = [];
+	}
+	var type = type_vvvvwav.some(type_vvvvwav_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwavwah_required)
 		{
-			updateFieldRequired('groups',0);
-			jQuery('#jform_groups').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwavwah_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
+			jform_vvvvwavwah_required = true;
+		}
+	}
+}
+
+// the vvvvwav Some function
+function type_vvvvwav_SomeFunc(type_vvvvwav)
+{
+	// set the function logic
+	if (type_vvvvwav == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaw function
+function vvvvwaw(type_vvvvwaw)
+{
+	if (isSet(type_vvvvwaw) && type_vvvvwaw.constructor !== Array)
+	{
+		var temp_vvvvwaw = type_vvvvwaw;
+		var type_vvvvwaw = [];
+		type_vvvvwaw.push(temp_vvvvwaw);
+	}
+	else if (!isSet(type_vvvvwaw))
+	{
+		var type_vvvvwaw = [];
+	}
+	var type = type_vvvvwaw.some(type_vvvvwaw_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
+		if (jform_vvvvwawwai_required)
+		{
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
+			jform_vvvvwawwai_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_article').closest('.control-group').hide();
+		if (!jform_vvvvwawwai_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwawwai_required = true;
+		}
+	}
+}
+
+// the vvvvwaw Some function
+function type_vvvvwaw_SomeFunc(type_vvvvwaw)
+{
+	// set the function logic
+	if (type_vvvvwaw == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwax function
+function vvvvwax(type_vvvvwax)
+{
+	if (isSet(type_vvvvwax) && type_vvvvwax.constructor !== Array)
+	{
+		var temp_vvvvwax = type_vvvvwax;
+		var type_vvvvwax = [];
+		type_vvvvwax.push(temp_vvvvwax);
+	}
+	else if (!isSet(type_vvvvwax))
+	{
+		var type_vvvvwax = [];
+	}
+	var type = type_vvvvwax.some(type_vvvvwax_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwaxwaj_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwaxwaj_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwaxwaj_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwaxwaj_required = true;
+		}
+	}
+}
+
+// the vvvvwax Some function
+function type_vvvvwax_SomeFunc(type_vvvvwax)
+{
+	// set the function logic
+	if (type_vvvvwax == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvway function
+function vvvvway(target_vvvvway)
+{
+	// set the function logic
+	if (target_vvvvway == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwaywak_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwaywak_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwaywak_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwavwah_required = true;
+			jform_vvvvwaywak_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyxvyt_required = false;
+jform_vvvvvyxvyu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyx(add_php_view_vvvvvyx)
 	if (add_php_view_vvvvvyx == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyxvyt_required)
+		if (jform_vvvvvyxvyu_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_vvvvvyxvyt_required = false;
+			jform_vvvvvyxvyu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyt_required)
+		if (!jform_vvvvvyxvyu_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_vvvvvyxvyt_required = true;
+			jform_vvvvvyxvyu_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -23,21 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzzvzq_required = false;
-jform_vvvvwafvzr_required = false;
+jform_vvvvwacvzt_required = false;
+jform_vvvvwaivzu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvvzy = jQuery("#jform_how").val();
-	vvvvvzy(how_vvvvvzy);
-
-	var how_vvvvvzz = jQuery("#jform_how").val();
-	vvvvvzz(how_vvvvvzz);
-
-	var how_vvvvwaa = jQuery("#jform_how").val();
-	vvvvwaa(how_vvvvwaa);
-
 	var how_vvvvwab = jQuery("#jform_how").val();
 	vvvvwab(how_vvvvwab);
 
@@ -50,141 +41,19 @@ jQuery(document).ready(function()
 	var how_vvvvwae = jQuery("#jform_how").val();
 	vvvvwae(how_vvvvwae);
 
-	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaf(type_vvvvwaf);
+	var how_vvvvwaf = jQuery("#jform_how").val();
+	vvvvwaf(how_vvvvwaf);
+
+	var how_vvvvwag = jQuery("#jform_how").val();
+	vvvvwag(how_vvvvwag);
+
+	var how_vvvvwah = jQuery("#jform_how").val();
+	vvvvwah(how_vvvvwah);
+
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(type_vvvvwai);
 });
 
-// the vvvvvzy function
-function vvvvvzy(how_vvvvvzy)
-{
-	if (isSet(how_vvvvvzy) && how_vvvvvzy.constructor !== Array)
-	{
-		var temp_vvvvvzy = how_vvvvvzy;
-		var how_vvvvvzy = [];
-		how_vvvvvzy.push(temp_vvvvvzy);
-	}
-	else if (!isSet(how_vvvvvzy))
-	{
-		var how_vvvvvzy = [];
-	}
-	var how = how_vvvvvzy.some(how_vvvvvzy_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 vvvvvzy Some function
-function how_vvvvvzy_SomeFunc(how_vvvvvzy)
-{
-	// set the function logic
-	if (how_vvvvvzy == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzz function
-function vvvvvzz(how_vvvvvzz)
-{
-	if (isSet(how_vvvvvzz) && how_vvvvvzz.constructor !== Array)
-	{
-		var temp_vvvvvzz = how_vvvvvzz;
-		var how_vvvvvzz = [];
-		how_vvvvvzz.push(temp_vvvvvzz);
-	}
-	else if (!isSet(how_vvvvvzz))
-	{
-		var how_vvvvvzz = [];
-	}
-	var how = how_vvvvvzz.some(how_vvvvvzz_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvvzzvzq_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_vvvvvzzvzq_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzq_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_vvvvvzzvzq_required = true;
-		}
-	}
-}
-
-// the vvvvvzz Some function
-function how_vvvvvzz_SomeFunc(how_vvvvvzz)
-{
-	// set the function logic
-	if (how_vvvvvzz == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwaa function
-function vvvvwaa(how_vvvvwaa)
-{
-	if (isSet(how_vvvvwaa) && how_vvvvwaa.constructor !== Array)
-	{
-		var temp_vvvvwaa = how_vvvvwaa;
-		var how_vvvvwaa = [];
-		how_vvvvwaa.push(temp_vvvvwaa);
-	}
-	else if (!isSet(how_vvvvwaa))
-	{
-		var how_vvvvwaa = [];
-	}
-	var how = how_vvvvwaa.some(how_vvvvwaa_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwaa Some function
-function how_vvvvwaa_SomeFunc(how_vvvvwaa)
-{
-	// set the function logic
-	if (how_vvvvwaa == 2 || how_vvvvwaa == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwab function
 function vvvvwab(how_vvvvwab)
 {
@@ -204,11 +73,11 @@ function vvvvwab(how_vvvvwab)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -216,7 +85,7 @@ function vvvvwab(how_vvvvwab)
 function how_vvvvwab_SomeFunc(how_vvvvwab)
 {
 	// set the function logic
-	if (how_vvvvwab == 1 || how_vvvvwab == 2 || how_vvvvwab == 3)
+	if (how_vvvvwab == 2)
 	{
 		return true;
 	}
@@ -242,15 +111,28 @@ function vvvvwac(how_vvvvwac)
 	// 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();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwacvzt_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwacvzt_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.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();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwacvzt_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwacvzt_required = true;
+		}
 	}
 }
 
@@ -258,7 +140,7 @@ function vvvvwac(how_vvvvwac)
 function how_vvvvwac_SomeFunc(how_vvvvwac)
 {
 	// set the function logic
-	if (how_vvvvwac == 0)
+	if (how_vvvvwac == 3)
 	{
 		return true;
 	}
@@ -284,13 +166,11 @@ function vvvvwad(how_vvvvwad)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -298,7 +178,7 @@ function vvvvwad(how_vvvvwad)
 function how_vvvvwad_SomeFunc(how_vvvvwad)
 {
 	// set the function logic
-	if (how_vvvvwad == 1)
+	if (how_vvvvwad == 2 || how_vvvvwad == 3)
 	{
 		return true;
 	}
@@ -321,6 +201,126 @@ function vvvvwae(how_vvvvwae)
 	var how = how_vvvvwae.some(how_vvvvwae_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwae Some function
+function how_vvvvwae_SomeFunc(how_vvvvwae)
+{
+	// set the function logic
+	if (how_vvvvwae == 1 || how_vvvvwae == 2 || how_vvvvwae == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaf function
+function vvvvwaf(how_vvvvwaf)
+{
+	if (isSet(how_vvvvwaf) && how_vvvvwaf.constructor !== Array)
+	{
+		var temp_vvvvwaf = how_vvvvwaf;
+		var how_vvvvwaf = [];
+		how_vvvvwaf.push(temp_vvvvwaf);
+	}
+	else if (!isSet(how_vvvvwaf))
+	{
+		var how_vvvvwaf = [];
+	}
+	var how = how_vvvvwaf.some(how_vvvvwaf_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 vvvvwaf Some function
+function how_vvvvwaf_SomeFunc(how_vvvvwaf)
+{
+	// set the function logic
+	if (how_vvvvwaf == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwag function
+function vvvvwag(how_vvvvwag)
+{
+	if (isSet(how_vvvvwag) && how_vvvvwag.constructor !== Array)
+	{
+		var temp_vvvvwag = how_vvvvwag;
+		var how_vvvvwag = [];
+		how_vvvvwag.push(temp_vvvvwag);
+	}
+	else if (!isSet(how_vvvvwag))
+	{
+		var how_vvvvwag = [];
+	}
+	var how = how_vvvvwag.some(how_vvvvwag_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 vvvvwag Some function
+function how_vvvvwag_SomeFunc(how_vvvvwag)
+{
+	// set the function logic
+	if (how_vvvvwag == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwah function
+function vvvvwah(how_vvvvwah)
+{
+	if (isSet(how_vvvvwah) && how_vvvvwah.constructor !== Array)
+	{
+		var temp_vvvvwah = how_vvvvwah;
+		var how_vvvvwah = [];
+		how_vvvvwah.push(temp_vvvvwah);
+	}
+	else if (!isSet(how_vvvvwah))
+	{
+		var how_vvvvwah = [];
+	}
+	var how = how_vvvvwah.some(how_vvvvwah_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -336,44 +336,44 @@ function vvvvwae(how_vvvvwae)
 	}
 }
 
-// the vvvvwae Some function
-function how_vvvvwae_SomeFunc(how_vvvvwae)
+// the vvvvwah Some function
+function how_vvvvwah_SomeFunc(how_vvvvwah)
 {
 	// set the function logic
-	if (how_vvvvwae == 4)
+	if (how_vvvvwah == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwaf function
-function vvvvwaf(type_vvvvwaf)
+// the vvvvwai function
+function vvvvwai(type_vvvvwai)
 {
 	// set the function logic
-	if (type_vvvvwaf == 2)
+	if (type_vvvvwai == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwafvzr_required)
+		if (jform_vvvvwaivzu_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwafvzr_required = false;
+			jform_vvvvwaivzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwafvzr_required)
+		if (!jform_vvvvwaivzu_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwafvzr_required = true;
+			jform_vvvvwaivzu_required = true;
 		}
 	}
 }

admin/models/forms/site_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvylvyh_required = false;
-jform_vvvvvymvyi_required = false;
-jform_vvvvvynvyj_required = false;
-jform_vvvvvyovyk_required = false;
-jform_vvvvvypvyl_required = false;
-jform_vvvvvyqvym_required = false;
-jform_vvvvvyrvyn_required = false;
-jform_vvvvvysvyo_required = false;
-jform_vvvvvytvyp_required = false;
-jform_vvvvvyuvyq_required = false;
+jform_vvvvvylvyi_required = false;
+jform_vvvvvymvyj_required = false;
+jform_vvvvvynvyk_required = false;
+jform_vvvvvyovyl_required = false;
+jform_vvvvvypvym_required = false;
+jform_vvvvvyqvyn_required = false;
+jform_vvvvvyrvyo_required = false;
+jform_vvvvvysvyp_required = false;
+jform_vvvvvytvyq_required = false;
 jform_vvvvvyuvyr_required = false;
+jform_vvvvvyuvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -79,26 +79,26 @@ function vvvvvyl(add_php_view_vvvvvyl)
 	if (add_php_view_vvvvvyl == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvylvyh_required)
+		if (jform_vvvvvylvyi_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_vvvvvylvyh_required = false;
+			jform_vvvvvylvyi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvylvyh_required)
+		if (!jform_vvvvvylvyi_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_vvvvvylvyh_required = true;
+			jform_vvvvvylvyi_required = true;
 		}
 	}
 }
@@ -110,26 +110,26 @@ function vvvvvym(add_php_jview_display_vvvvvym)
 	if (add_php_jview_display_vvvvvym == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvymvyi_required)
+		if (jform_vvvvvymvyj_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_vvvvvymvyi_required = false;
+			jform_vvvvvymvyj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvymvyi_required)
+		if (!jform_vvvvvymvyj_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvymvyi_required = true;
+			jform_vvvvvymvyj_required = true;
 		}
 	}
 }
@@ -141,26 +141,26 @@ function vvvvvyn(add_php_jview_vvvvvyn)
 	if (add_php_jview_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvynvyj_required)
+		if (jform_vvvvvynvyk_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvynvyj_required = false;
+			jform_vvvvvynvyk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvynvyj_required)
+		if (!jform_vvvvvynvyk_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvynvyj_required = true;
+			jform_vvvvvynvyk_required = true;
 		}
 	}
 }
@@ -172,26 +172,26 @@ function vvvvvyo(add_php_document_vvvvvyo)
 	if (add_php_document_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyovyk_required)
+		if (jform_vvvvvyovyl_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyovyk_required = false;
+			jform_vvvvvyovyl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyovyk_required)
+		if (!jform_vvvvvyovyl_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyovyk_required = true;
+			jform_vvvvvyovyl_required = true;
 		}
 	}
 }
@@ -203,26 +203,26 @@ function vvvvvyp(add_css_document_vvvvvyp)
 	if (add_css_document_vvvvvyp == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvypvym_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvypvyl_required = false;
+			jform_vvvvvypvym_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvypvym_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvypvyl_required = true;
+			jform_vvvvvypvym_required = true;
 		}
 	}
 }
@@ -234,26 +234,26 @@ function vvvvvyq(add_javascript_file_vvvvvyq)
 	if (add_javascript_file_vvvvvyq == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvyqvym_required)
+		if (jform_vvvvvyqvyn_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyqvym_required = false;
+			jform_vvvvvyqvyn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvyqvym_required)
+		if (!jform_vvvvvyqvyn_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyqvym_required = true;
+			jform_vvvvvyqvyn_required = true;
 		}
 	}
 }
@@ -265,26 +265,26 @@ function vvvvvyr(add_js_document_vvvvvyr)
 	if (add_js_document_vvvvvyr == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvyrvyo_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_vvvvvyrvyn_required = false;
+			jform_vvvvvyrvyo_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvyrvyo_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_vvvvvyrvyn_required = true;
+			jform_vvvvvyrvyo_required = true;
 		}
 	}
 }
@@ -296,26 +296,26 @@ function vvvvvys(add_css_vvvvvys)
 	if (add_css_vvvvvys == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvysvyp_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvysvyo_required = true;
+			jform_vvvvvysvyp_required = true;
 		}
 	}
 }
@@ -328,13 +328,13 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvytvyp_required)
+		if (jform_vvvvvytvyq_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_vvvvvytvyp_required = false;
+			jform_vvvvvytvyq_required = false;
 		}
 
 	}
@@ -342,13 +342,13 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvytvyp_required)
+		if (!jform_vvvvvytvyq_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_vvvvvytvyp_required = true;
+			jform_vvvvvytvyq_required = true;
 		}
 	}
 }
@@ -361,23 +361,23 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyuvyq_required)
+		if (jform_vvvvvyuvyr_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_vvvvvyuvyq_required = false;
+			jform_vvvvvyuvyr_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyuvyr_required)
+		if (jform_vvvvvyuvys_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_vvvvvyuvyr_required = false;
+			jform_vvvvvyuvys_required = false;
 		}
 
 	}
@@ -385,22 +385,22 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyq_required)
+		if (!jform_vvvvvyuvyr_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_vvvvvyuvyq_required = true;
+			jform_vvvvvyuvyr_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyr_required)
+		if (!jform_vvvvvyuvys_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_vvvvvyuvyr_required = true;
+			jform_vvvvvyuvys_required = true;
 		}
 	}
 }

admin/models/forms/template.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvywvys_required = false;
+jform_vvvvvywvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyw(add_php_view_vvvvvyw)
 	if (add_php_view_vvvvvyw == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvywvys_required)
+		if (jform_vvvvvywvyt_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_vvvvvywvys_required = false;
+			jform_vvvvvywvyt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvywvys_required)
+		if (!jform_vvvvvywvyt_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_vvvvvywvys_required = true;
+			jform_vvvvvywvyt_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 getWablinked_components()
+	public function getWaelinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/models/import_joomla_components.php

@@ -1493,6 +1493,20 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				}
 				// remove from this dataset
 				unset($item->addfolders);
+				// update the add_css
+				if (isset($item->add_css))
+				{
+					$item->add_css_admin = $item->add_css;
+				}
+				// remove from this dataset
+				unset($item->add_css);
+				// update the css
+				if (isset($item->css) && ComponentbuilderHelper::checkString($item->css))
+				{
+					$item->css_admin = $item->css;
+				}
+				// remove from this dataset
+				unset($item->css);
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker

admin/models/import_language_translations.php

@@ -0,0 +1,682 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		import_language_translations.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Componentbuilder Import_language_translations Model
+ */
+class ComponentbuilderModelImport_language_translations extends JModelLegacy
+{
+	// set uploading values
+	protected $use_streams = false;
+	protected $allow_unsafe = false;
+	protected $safeFileOptions = array();
+	
+	/**
+	 * @var object JTable object
+	 */
+	protected $_table = null;
+
+	/**
+	 * @var object JTable object
+	 */
+	protected $_url = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_componentbuilder.import_language_translations';
+	
+	/**
+	 * Import Settings
+	 */
+	protected $getType = NULL;
+	protected $dataType = NULL;
+	
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		$this->setState('message', $app->getUserState('com_componentbuilder.message'));
+		$app->setUserState('com_componentbuilder.message', '');
+
+		// Recall the 'Import from Directory' path.
+		$path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path'));
+		$this->setState('import.directory', $path);
+		parent::populateState();
+	}
+	
+	/**
+	 * Import an spreadsheet from either folder, url or upload.
+	 *
+	 * @return  boolean result of import
+	 *
+	 */
+	public function import()
+	{
+		$this->setState('action', 'import');
+		$app 		= JFactory::getApplication();
+		$session 	= JFactory::getSession();
+		$package 	= null;
+		$continue	= false;
+		// get import type
+		$this->getType = $app->input->getString('gettype', NULL);
+		// get import type
+		$this->dataType	= $session->get('dataType_VDM_IMPORTINTO', NULL);
+
+		if ($package === null)
+		{
+			switch ($this->getType)
+			{
+				case 'folder':
+					// Remember the 'Import from Directory' path.
+					$app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory');
+					$package = $this->_getPackageFromFolder();
+					break;
+
+				case 'upload':
+					$package = $this->_getPackageFromUpload();
+					break;
+
+				case 'url':
+					$package = $this->_getPackageFromUrl();
+					break;
+
+				case 'continue':
+					$continue 	= true;
+					$package	= $session->get('package', null);
+					$package	= json_decode($package, true);
+					// clear session
+					$session->clear('package');
+					$session->clear('dataType');
+					$session->clear('hasPackage');
+					break;
+
+				default:
+					$app->setUserState('com_componentbuilder.message', JText::_('COM_COMPONENTBUILDER_IMPORT_NO_IMPORT_TYPE_FOUND'));
+
+					return false;
+					break;
+			}
+		}
+		// Was the package valid?
+		if (!$package || !$package['type'])
+		{
+			if (in_array($this->getType, array('upload', 'url')))
+			{
+				$this->remove($package['packagename']);
+			}
+
+			$app->setUserState('com_componentbuilder.message', JText::_('COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
+			return false;
+		}
+		
+		// first link data to table headers
+		if(!$continue){
+			$package	= json_encode($package);
+			$session->set('package', $package);
+			$session->set('dataType', $this->dataType);
+			$session->set('hasPackage', true);
+			return true;
+		}
+		// set the data
+		$headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true);
+		if (!$this->setData($package,$this->dataType,$headerList))
+		{
+			// There was an error importing the package
+			$msg = JText::_('COM_COMPONENTBUILDER_IMPORT_ERROR');
+			$back = $session->get('backto_VDM_IMPORT', NULL);
+			if ($back)
+			{
+				$app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&view='.$back);
+				$session->clear('backto_VDM_IMPORT');
+			}
+			$result = false;
+		}
+		else
+		{
+			// Package imported sucessfully
+			$msg = JText::sprintf('COM_COMPONENTBUILDER_IMPORT_SUCCESS', $package['packagename']);
+			$back = $session->get('backto_VDM_IMPORT', NULL);
+			if ($back)
+			{
+			    $app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&view='.$back);
+			    $session->clear('backto_VDM_IMPORT');
+			}
+			$result = true;
+		}
+
+		// Set some model state values
+		$app->enqueueMessage($msg);
+
+		// remove file after import
+		$this->remove($package['packagename']);
+		$session->clear($this->getType.'_VDM_IMPORTHEADERS');
+		return $result;
+	} 
+
+	/**
+	 * Works out an importation spreadsheet from a HTTP upload
+	 *
+	 * @return spreadsheet definition or false on failure
+	 */
+	protected function _getPackageFromUpload()
+	{		
+		// Get the uploaded file information
+		$app = JFactory::getApplication();
+		$input = $app->input;
+
+		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
+		$userfile = $input->files->get('import_package', null, 'raw');
+		
+		// Make sure that file uploads are enabled in php
+		if (!(bool) ini_get('file_uploads'))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
+			return false;
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if (!is_array($userfile))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
+			return false;
+		}
+
+		// Check if there was a problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
+			return false;
+		}
+
+		// Build the appropriate paths
+		$config = JFactory::getConfig();
+		$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
+		$tmp_src = $userfile['tmp_name'];
+
+		// Move uploaded file
+		jimport('joomla.filesystem.file');
+		$p_file = JFile::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			$session = JFactory::getSession();
+			$session->clear('package');
+			$session->clear('dataType');
+			$session->clear('hasPackage');
+			// was not uploaded
+			return false;
+		}
+
+		// check that this is a valid spreadsheet
+		$package = $this->check($userfile['name']);
+
+		return $package;
+	}
+
+	/**
+	 * Import an spreadsheet from a directory
+	 *
+	 * @return  array  Spreadsheet details or false on failure
+	 *
+	 */
+	protected function _getPackageFromFolder()
+	{
+		$app = JFactory::getApplication();
+		$input = $app->input;
+
+		// Get the path to the package to import
+		$p_dir = $input->getString('import_directory');
+		$p_dir = JPath::clean($p_dir);
+		// Did you give us a valid path?
+		if (!file_exists($p_dir))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
+			return false;
+		}
+
+		// Detect the package type
+		$type = $this->getType;
+
+		// Did you give us a valid package?
+		if (!$type)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
+		}
+		
+		// check the extention
+		if(!$this->checkExtension($p_dir))
+		{
+			// set error message
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			return false;
+		}
+		
+		$package['packagename'] = null;
+		$package['dir'] = $p_dir;
+		$package['type'] = $type;
+
+		return $package;
+	}
+
+	/**
+	 * Import an spreadsheet from a URL
+	 *
+	 * @return  Package details or false on failure
+	 *
+	 */
+	protected function _getPackageFromUrl()
+	{
+		$app = JFactory::getApplication();
+		$input = $app->input;
+
+		// Get the URL of the package to import
+		$url = $input->getString('import_url');
+
+		// Did you give us a URL?
+		if (!$url)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL'), 'warning');
+			return false;
+		}
+
+		// Download the package at the URL given
+		$p_file = JInstallerHelper::downloadPackage($url);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_INVALID_URL'), 'warning');
+			return false;
+		}
+
+		// check that this is a valid spreadsheet
+		$package = $this->check($p_file);
+
+		return $package;
+	}
+	
+	/**
+	 * Check a file and verifies it as a spreadsheet file
+	 * Supports .csv .xlsx .xls and .ods
+	 *
+	 * @param   string  $p_filename  The uploaded package filename or import directory
+	 *
+	 * @return  array  of elements
+	 *
+	 */
+	protected function check($archivename)
+	{
+		$app = JFactory::getApplication();
+		// Clean the name
+		$archivename = JPath::clean($archivename);
+		
+		// check the extention
+		if(!$this->checkExtension($archivename))
+		{
+			// Cleanup the import files
+			$this->remove($archivename);
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			return false;
+		}
+		
+		$config = JFactory::getConfig();
+		// set Package Name
+		$check['packagename'] = $archivename;
+		
+		// set directory
+		$check['dir'] = $config->get('tmp_path'). '/' .$archivename;
+		
+		// set type
+		$check['type'] = $this->getType;
+		
+		return $check;
+	}
+	
+	/**
+	 * Check the extension
+	 *
+	 * @param   string  $file    Name of the uploaded file
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+	protected function checkExtension($file)
+	{
+		// check the extention
+		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
+		{
+			case 'xls':
+			case 'ods':
+			case 'csv':
+			return true;
+			break;
+		}
+		return false;
+	} 
+	
+	/**
+	 * Clean up temporary uploaded spreadsheet
+	 *
+	 * @param   string  $package    Name of the uploaded spreadsheet file
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+	protected function remove($package)
+	{
+		jimport('joomla.filesystem.file');
+		
+		$config = JFactory::getConfig();
+		$package = $config->get('tmp_path'). '/' .$package;
+
+		// Is the package file a valid file?
+		if (is_file($package))
+		{
+			JFile::delete($package);
+		}
+		elseif (is_file(JPath::clean($package)))
+		{
+			// It might also be just a base filename
+			JFile::delete(JPath::clean($package));
+		}
+	}
+	
+	/**
+	* Set the data from the spreadsheet to the database
+	*
+	* @param string  $package Paths to the uploaded package file
+	*
+	* @return  boolean false on failure
+	*
+	**/
+	protected function setData($package,$table,$target_headers)
+	{
+		if (ComponentbuilderHelper::checkArray($target_headers))
+		{
+			// make sure the file is loaded		
+			JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
+			$jinput = JFactory::getApplication()->input;
+			foreach($target_headers as $header)
+			{
+				$data['target_headers'][$header] = $jinput->getString($header, null);
+			}
+			// set the data
+			if(isset($package['dir']))
+			{
+				$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
+				$excelReader = PHPExcel_IOFactory::createReader($inputFileType);
+				$excelReader->setReadDataOnly(true);
+				$excelObj = $excelReader->load($package['dir']);
+				$data['array'] = $excelObj->getActiveSheet()->toArray(null, true,true,true);
+				$excelObj->disconnectWorksheets();
+				unset($excelObj);
+				return $this->save($data,$table);
+			}
+		}
+		return false;
+	} 
+	
+	/**
+	* Save the data from the file to the database
+	*
+	* @param string  $package Paths to the uploaded package file
+	*
+	* @return  boolean false on failure
+	*
+	**/
+	protected function save($data,$table)
+	{
+		// import the data if there is any
+		if(ComponentbuilderHelper::checkArray($data['array']))
+		{
+			// get user object
+			$user  		= JFactory::getUser();
+			// remove header if it has headers
+			$id_key 	= $data['target_headers']['id'];
+			$english_key 	= $data['target_headers']['English'];
+			// get the first array set
+			$firstSet = reset($data['array']);
+
+			// check if first array is a header array and remove if true
+			if($firstSet[$id_key] == 'id' || $firstSet[$english_key] == 'English')
+			{
+				array_shift($data['array']);
+			}
+			
+			// make sure there is still values in array and that it was not only headers
+			if(ComponentbuilderHelper::checkArray($data['array']) && $user->authorise($table.'.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+			{
+				// set target.
+				$target	= array_flip($data['target_headers']);
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// set some defaults
+				$todayDate		= JFactory::getDate()->toSql();
+				// get global action permissions
+				$canDo			= ComponentbuilderHelper::getActions($table);
+				$canEdit		= $canDo->get('core.edit');
+				// proses the data
+				foreach($data['array'] as $row)
+				{
+					$found = false;
+					if (isset($row[$id_key]) && is_numeric($row[$id_key]) && $row[$id_key] > 0)
+					{
+						// raw items import & update!
+						$query = $db->getQuery(true);
+						$query
+							->select($db->quoteName(array('version', 'translation')))
+							->from($db->quoteName('#__componentbuilder_'.$table))
+							->where($db->quoteName('id') . ' = '. $db->quote($row[$id_key]))
+							->where($db->quoteName('entranslation') . ' = '. $db->quote($row[$english_key]));
+						// Reset the query using our newly populated query object.
+						$db->setQuery($query);
+						$db->execute();
+						$found = $db->getNumRows();
+					}
+					
+					if($found && $canEdit)
+					{
+						// update item
+						$id 		= $row[$id_key];
+						$item	= $db->loadObject();
+						// load previous translation strings
+						if (ComponentbuilderHelper::checkJson($item->translation))
+						{
+							$translations = json_decode($item->translation, true);
+							$counter = count($translations) + 2;
+							$pre = true;
+						}
+						else
+						{
+							$translations = array();
+							$counter = 0;
+							$pre = false;
+						}
+						// get languages
+						$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+						// reset all buckets
+						$query 		= $db->getQuery(true);
+						$fields 	= array();
+						// Fields to update.
+						foreach($row as $key => $cell)
+						{
+							// ignore column
+							if ('IGNORE' === $target[$key] || 'modified_by' === $target[$key] || 'modified' === $target[$key] || 'English' === $target[$key] )
+							{
+								continue;
+							}
+							// update version
+							if ('version' == $target[$key])
+							{
+								$cell = (int) $item->version + 1;
+							}
+							// verify publish authority
+							if ('published' == $target[$key] && !$canState)
+							{
+								continue;
+							}
+							// set to translations
+							if(in_array($target[$key], $languages))
+							{
+								// only add if it has a string
+								if (ComponentbuilderHelper::checkString($cell))
+								{
+									// remove if was set previously
+									if ($pre)
+									{
+										$tag = $target[$key];
+										$translations = array_filter(
+											$translations,
+											function($trans) use($tag) {
+												if ($trans['language'] !== $tag)
+												{
+													return true;
+												}
+												return false;
+											});
+									}
+									$translations['translation'.$counter] = array('language' => $target[$key], 'translation' => $cell);
+									$counter++;
+								}
+							}
+							// set to update array
+							elseif(in_array($key, $data['target_headers']) && is_numeric($cell))
+							{
+								$fields[] = $db->quoteName($target[$key]) . ' = ' . $cell;
+							}
+							elseif(in_array($key, $data['target_headers']) && is_string($cell))
+							{
+								$fields[] = $db->quoteName($target[$key]) . ' = ' . $db->quote($cell);
+							}
+							elseif(in_array($key, $data['target_headers']) && is_null($cell))
+							{
+								// if import data is null then set empty
+								$fields[] = $db->quoteName($target[$key]) . " = ''";
+							}
+						}
+						// set the translation
+						if (ComponentbuilderHelper::checkArray($translations))
+						{
+							$fields[] = $db->quoteName('translation') . ' = ' . $db->quote(json_encode($translations, JSON_FORCE_OBJECT));
+							// load the defaults
+							$fields[]	= $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
+							$fields[]	= $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
+							// Conditions for which records should be updated.
+							$conditions = array(
+								$db->quoteName('id') . ' = ' . $id
+							);
+						
+							$query->update($db->quoteName('#__componentbuilder_'.$table))->set($fields)->where($conditions);
+							$db->setQuery($query);
+							$db->execute();
+						}
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	protected function getAlias($name,$type = false)
+	{
+		// sanitize the name to an alias
+		if (JFactory::getConfig()->get('unicodeslugs') == 1)
+		{
+			$alias = JFilterOutput::stringURLUnicodeSlug($name);
+		}
+		else
+		{
+			$alias = JFilterOutput::stringURLSafe($name);
+		}
+		// must be a uniqe alias
+		if ($type)
+		{
+			return $this->getUniqe($alias,'alias',$type);
+		}
+		return $alias;
+	}
+	
+	/**
+	 * Method to generate a uniqe value.
+	 *
+	 * @param   string  $field name.
+	 * @param   string  $value data.
+	 * @param   string  $type table.
+	 *
+	 * @return  string  New value.
+	 */
+	protected function getUniqe($value,$field,$type)
+	{
+		// insure the filed is always uniqe
+		while (isset($this->uniqeValueArray[$type][$field][$value]))
+		{
+			$value = JString::increment($value, 'dash');
+		}
+		$this->uniqeValueArray[$type][$field][$value] = $value;
+		return $value;
+	}
+	
+	protected function getAliasesUsed($table)
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		// first we check if there is a alias column
+		$columns = $db->getTableColumns('#__componentbuilder_'.$table);
+		if(isset($columns['alias'])){
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName(array('alias')));
+			$query->from($db->quoteName('#__componentbuilder_'.$table));
+			$db->setQuery($query);
+			$db->execute();
+			if ($db->getNumRows())
+			{
+				$aliases = $db->loadColumn();
+				foreach($aliases as $alias)
+				{
+					$this->uniqeValueArray[$table]['alias'][$alias] = $alias;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+}

admin/models/joomla_component.php

@@ -414,6 +414,53 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
+			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				// insure we have the same order in the languages
+				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// set the lang order
+					if ($nr != 0)
+					{
+						foreach ($languages as $lanTag)
+						{
+							$item->{$lanTag} = '';
+						}
+						// now adapt the entranslation
+						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+						{
+							$translations = json_decode($item->translation, true);
+							if (ComponentbuilderHelper::checkArray($translations))
+							{
+								foreach ($translations as $language)
+								{
+									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+									{
+										$item->{$language['language']} = $language['translation'];
+									}
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
 			}
 			return $items;
 		}

admin/models/language_translation.php

@@ -107,13 +107,13 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 				$translation->loadString($item->translation);
 				$item->translation = $translation->toArray();
 			}
-
+			
 			if (!empty($item->components))
 			{
 				// JSON Decode components.
-				$item->components = json_decode($item->components);
+				$item->components = json_decode($item->components, true);
 			}
-
+			
 			
 			if (empty($item->id))
 			{

admin/models/language_translations.php

@@ -161,6 +161,53 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 					}
 				}
 			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				// insure we have the same order in the languages
+				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// set the lang order
+					if ($nr != 0)
+					{
+						foreach ($languages as $lanTag)
+						{
+							$item->{$lanTag} = '';
+						}
+						// now adapt the entranslation
+						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+						{
+							$translations = json_decode($item->translation, true);
+							if (ComponentbuilderHelper::checkArray($translations))
+							{
+								foreach ($translations as $language)
+								{
+									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+									{
+										$item->{$language['language']} = $language['translation'];
+									}
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
+			}
         
 		// return items
 		return $items;
@@ -346,6 +393,53 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
+			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				// insure we have the same order in the languages
+				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// set the lang order
+					if ($nr != 0)
+					{
+						foreach ($languages as $lanTag)
+						{
+							$item->{$lanTag} = '';
+						}
+						// now adapt the entranslation
+						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+						{
+							$translations = json_decode($item->translation, true);
+							if (ComponentbuilderHelper::checkArray($translations))
+							{
+								foreach ($translations as $language)
+								{
+									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+									{
+										$item->{$language['language']} = $language['translation'];
+									}
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
 			}
 				return $items;
 			}
@@ -353,31 +447,27 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 		return false;
 	}
 
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_language_translation");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
+	/**
+	* Method to get header.
+	*
+	* @return mixed  An array of data items on success, false on failure.
+	*/
+	public function getExImPortHeaders()
+	{
+		$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+		// start setup of headers
+		$headers = new stdClass();
+		$headers->id = 'id';
+		$headers->English = 'English';
+		// add the languages
+		if (ComponentbuilderHelper::checkArray($languages))
+		{
+			foreach ($languages as $language)
+			{
+				$headers->{$language} = $language;
+			}
+		}
+		return $headers;
 	} 
 	
 	/**

admin/sql/install.mysql.utf8.sql

@@ -193,6 +193,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_import` MEDIUMTEXT NOT NULL,
 	`php_import_display` MEDIUMTEXT NOT NULL,
 	`php_import_ext` MEDIUMTEXT NOT NULL,
+	`php_import_headers` MEDIUMTEXT NOT NULL,
 	`php_import_save` MEDIUMTEXT NOT NULL,
 	`php_import_setdata` MEDIUMTEXT NOT NULL,
 	`php_model` MEDIUMTEXT NOT NULL,
@@ -224,33 +225,33 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name_single` (`name_single`),
 	KEY `idx_name_list` (`name_list`),
-	KEY `idx_type` (`type`),
-	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_source` (`source`),
-	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`),
-	KEY `idx_add_css_views` (`add_css_views`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
-	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
-	KEY `idx_add_php_before_save` (`add_php_before_save`),
-	KEY `idx_add_php_save` (`add_php_save`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
-	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
-	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_custom_button` (`add_custom_button`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_add_php_ajax` (`add_php_ajax`),
+	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
 	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_type` (`type`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_fadein` (`add_fadein`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
+	KEY `idx_add_php_before_save` (`add_php_before_save`),
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
+	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_css_view` (`add_css_view`),
+	KEY `idx_add_css_views` (`add_css_views`),
+	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
+	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
+	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
+	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
+	KEY `idx_add_custom_button` (`add_custom_button`),
+	KEY `idx_source` (`source`),
+	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_php_getitem` (`add_php_getitem`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
@@ -481,6 +482,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`add_php_before_getitem` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_before_getitems` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0,
 	`addcalculation` CHAR NOT NULL DEFAULT '',
 	`db_selection` TEXT NOT NULL,
 	`db_table_main` VARCHAR(255) NOT NULL DEFAULT '',
@@ -502,6 +504,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`php_calculation` MEDIUMTEXT NOT NULL,
 	`php_custom_get` MEDIUMTEXT NOT NULL,
 	`php_getlistquery` MEDIUMTEXT NOT NULL,
+	`php_router_parse` MEDIUMTEXT NOT NULL,
 	`view_selection` TEXT NOT NULL,
 	`view_table_main` INT(11) NOT NULL DEFAULT 0,
 	`where` TEXT NOT NULL,
@@ -529,6 +532,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	KEY `idx_add_php_after_getitems` (`add_php_after_getitems`),
 	KEY `idx_add_php_before_getitems` (`add_php_before_getitems`),
 	KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
+	KEY `idx_add_php_router_parse` (`add_php_router_parse`),
 	KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_getcustom` (`getcustom`),

admin/sql/updates/mysql/2.6.10.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/2.6.11.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_import_headers` MEDIUMTEXT NOT NULL AFTER `php_import_ext`;

admin/sql/updates/mysql/2.6.12.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_dynamic_get` ADD `add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_getlistquery`;
+
+ALTER TABLE `#__componentbuilder_dynamic_get` ADD `php_router_parse` MEDIUMTEXT NOT NULL AFTER `php_getlistquery`;

admin/views/admin_view/tmpl/edit.php

@@ -729,7 +729,7 @@ jQuery(document).ready(function(){
 // #jform_add_custom_import listeners
 jQuery('#jform_add_custom_import').on('change',function() {
 	var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	getImportScripts(valueSwitch);
+	getDynamicScripts(valueSwitch);
 });
 			
 <?php

admin/views/componentbuilder/tmpl/default.php

@@ -91,12 +91,12 @@ JHtml::_('behavior.tooltip');
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'vast_development_method', JText::_('Vast Development Method', true)); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'notice_board', JText::_('Notice Board', true)); ?>
 		<div class="row-fluid">
 			<div class="span12">
-				<?php  echo JHtml::_('bootstrap.startAccordion', 'vast_development_method_accordian', array('active' => 'vast_development_method_one')); ?>
-					<?php  echo JHtml::_('bootstrap.addSlide', 'vast_development_method_accordian', 'Notice Board', 'vast_development_method_one'); ?>
-						<?php echo $this->loadTemplate('vast_development_method_notice_board');?>
+				<?php  echo JHtml::_('bootstrap.startAccordion', 'notice_board_accordian', array('active' => 'notice_board_one')); ?>
+					<?php  echo JHtml::_('bootstrap.addSlide', 'notice_board_accordian', 'Vast Development Method', 'notice_board_one'); ?>
+						<?php echo $this->loadTemplate('notice_board_vast_development_method');?>
 					<?php  echo JHtml::_('bootstrap.endSlide'); ?>
 				<?php  echo JHtml::_('bootstrap.endAccordion'); ?>
 			</div>

admin/views/componentbuilder/tmpl/default_notice_board_vast_development_method.php

@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		default_vast_development_method_notice_board.php
+	@subpackage		default_notice_board_vast_development_method.php
 	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved

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_vvvvvzu function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu);
-
-});
-
-// #jform_target listeners for target_vvvvvzv function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(target_vvvvvzv);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(target_vvvvvzv);
-
-});
-
-// #jform_target listeners for target_vvvvvzw function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
-
-});
-
-// #jform_type listeners for type_vvvvvzw function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
-
-});
-
-// #jform_type listeners for type_vvvvvzx function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
-
-});
-
 // #jform_target listeners for target_vvvvvzx function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+	vvvvvzx(target_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+	vvvvvzx(target_vvvvvzx);
+
+});
+
+// #jform_target listeners for target_vvvvvzy function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzy(target_vvvvvzy);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzy(target_vvvvvzy);
+
+});
+
+// #jform_target listeners for target_vvvvvzz function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
+
+});
+
+// #jform_type listeners for type_vvvvvzz function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
+
+});
+
+// #jform_type listeners for type_vvvvwaa function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+
+});
+
+// #jform_target listeners for target_vvvvwaa function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -570,6 +570,55 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
+// #jform_gettype listeners for gettype_vvvvvzu function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(gettype_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(gettype_vvvvvzu);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzv function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzv function
+jQuery('#jform_add_php_router_parse').on('keyup',function()
+{
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvvzv = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvvzv(gettype_vvvvvzv,add_php_router_parse_vvvvvzv);
+
+});
+
 
 <?php $fieldNrs = range(0,50,1); ?>
 <?php $fieldNames = array('db' => 'Db','view' => 'View'); ?>
@@ -598,6 +647,13 @@ jQuery(document).ready(function(){
 	get<?php echo $funcName; ?>TableColumns(value_<?php echo $fieldName ?>,'a','<?php echo $fieldName ?>',3,true, '','');
 });
 <?php endforeach; ?>
+
+// #jform_add_php_router_parse listeners
+jQuery('#jform_add_php_router_parse').on('change',function() {
+	var valueSwitch = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	getDynamicScripts(valueSwitch);
+});
+
 			
 // nice little dot trick :)
 jQuery(document).ready( function($) {

admin/views/field/tmpl/edit.php

@@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwag function
+// #jform_datalenght listeners for datalenght_vvvvwaj function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	vvvvwaj(datalenght_vvvvwaj);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	vvvvwaj(datalenght_vvvvwaj);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwah function
+// #jform_datadefault listeners for datadefault_vvvvwak function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	vvvvwak(datadefault_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	vvvvwak(datadefault_vvvvwak);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwai function
+// #jform_datatype listeners for datatype_vvvvwal function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
+	vvvvwal(datatype_vvvvwal);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
+	vvvvwal(datatype_vvvvwal);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwaj function
+// #jform_datatype listeners for datatype_vvvvwam function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
+	vvvvwam(datatype_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
+	vvvvwam(datatype_vvvvwam);
 
 });
 
-// #jform_store listeners for store_vvvvwak function
+// #jform_store listeners for store_vvvvwan function
 jQuery('#jform_store').on('keyup',function()
 {
-	var store_vvvvwak = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	var store_vvvvwan = jQuery("#jform_store").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwak = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	var store_vvvvwan = jQuery("#jform_store").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwak function
+// #jform_datatype listeners for datatype_vvvvwan function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwak = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	var store_vvvvwan = jQuery("#jform_store").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwak = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	var store_vvvvwan = jQuery("#jform_store").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwam function
+// #jform_add_css_view listeners for add_css_view_vvvvwap function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwap(add_css_view_vvvvwap);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwap(add_css_view_vvvvwap);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwan function
+// #jform_add_css_views listeners for add_css_views_vvvvwaq function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaq(add_css_views_vvvvwaq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaq(add_css_views_vvvvwaq);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwao function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwar function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwar(add_javascript_view_footer_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwar(add_javascript_view_footer_vvvvwar);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwap function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwas function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwas(add_javascript_views_footer_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwas(add_javascript_views_footer_vvvvwas);
 
 });
 

admin/views/fieldtype/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waafields = $this->get('Waafields');
+		$this->wadfields = $this->get('Wadfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/ftp/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wablinked_components = $this->get('Wablinked_components');
+		$this->waelinked_components = $this->get('Waelinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/help_document/tmpl/edit.php

@@ -127,93 +127,93 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwaq function
+// #jform_location listeners for location_vvvvwat function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwaq(location_vvvvwaq);
+	var location_vvvvwat = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwat(location_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwaq(location_vvvvwaq);
+	var location_vvvvwat = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwat(location_vvvvwat);
 
 });
 
-// #jform_location listeners for location_vvvvwar function
+// #jform_location listeners for location_vvvvwau function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwar(location_vvvvwar);
+	var location_vvvvwau = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwau(location_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwar(location_vvvvwar);
+	var location_vvvvwau = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwau(location_vvvvwau);
 
 });
 
-// #jform_type listeners for type_vvvvwas function
+// #jform_type listeners for type_vvvvwav function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwas = jQuery("#jform_type").val();
-	vvvvwas(type_vvvvwas);
+	var type_vvvvwav = jQuery("#jform_type").val();
+	vvvvwav(type_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwas = jQuery("#jform_type").val();
-	vvvvwas(type_vvvvwas);
+	var type_vvvvwav = jQuery("#jform_type").val();
+	vvvvwav(type_vvvvwav);
 
 });
 
-// #jform_type listeners for type_vvvvwat function
+// #jform_type listeners for type_vvvvwaw function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwat = jQuery("#jform_type").val();
-	vvvvwat(type_vvvvwat);
+	var type_vvvvwaw = jQuery("#jform_type").val();
+	vvvvwaw(type_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwat = jQuery("#jform_type").val();
-	vvvvwat(type_vvvvwat);
+	var type_vvvvwaw = jQuery("#jform_type").val();
+	vvvvwaw(type_vvvvwaw);
 
 });
 
-// #jform_type listeners for type_vvvvwau function
+// #jform_type listeners for type_vvvvwax function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwau = jQuery("#jform_type").val();
-	vvvvwau(type_vvvvwau);
+	var type_vvvvwax = jQuery("#jform_type").val();
+	vvvvwax(type_vvvvwax);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwau = jQuery("#jform_type").val();
-	vvvvwau(type_vvvvwau);
+	var type_vvvvwax = jQuery("#jform_type").val();
+	vvvvwax(type_vvvvwax);
 
 });
 
-// #jform_target listeners for target_vvvvwav function
+// #jform_target listeners for target_vvvvway function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwav(target_vvvvwav);
+	var target_vvvvway = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvway(target_vvvvway);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwav(target_vvvvwav);
+	var target_vvvvway = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvway(target_vvvvway);
 
 });
 

admin/views/import_language_translations/index.html

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

admin/views/import_language_translations/tmpl/default.php

@@ -0,0 +1,247 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		default.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
+?>
+<script type="text/javascript">
+<?php if ($this->hasPackage && ComponentbuilderHelper::checkArray($this->headerList)) : ?>
+	Joomla.continueImport = function()
+	{
+		var form = document.getElementById('adminForm');
+		var error = false;
+		var therequired = [<?php $i = 0; foreach($this->headerList as $name => $title) { echo ($i != 0)? ', "vdm_'.$name.'"':'"vdm_'.$name.'"'; $i++; } ?>];
+		for(i = 0; i < therequired.length; i++)
+		{
+			if(jQuery('#'+therequired[i]).val() == "" )
+			{
+				error = true;
+				break;
+			}
+		}
+		// do field validation
+		if (error)
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'continue';
+			form.submit();
+		}
+	};
+<?php else: ?>
+	Joomla.submitbutton = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_package.value == "")
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'upload';
+			form.submit();
+		}
+	};
+
+
+	Joomla.submitbutton3 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_directory.value == ""){
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'folder';
+			form.submit();
+		}
+	};
+
+
+	Joomla.submitbutton4 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_url.value == "" || form.import_url.value == "http://")
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'url';
+			form.submit();
+		}
+	};
+<?php endif; ?>
+
+
+// Add spindle-wheel for importations:
+jQuery(document).ready(function($) {
+	var outerDiv = $('body');
+
+
+	$('<div id="loading"></div>')
+		.css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat")
+		.css("top", outerDiv.position().top - $(window).scrollTop())
+		.css("left", outerDiv.position().left - $(window).scrollLeft())
+		.css("width", outerDiv.width())
+		.css("height", outerDiv.height())
+		.css("position", "fixed")
+		.css("opacity", "0.80")
+		.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
+		.css("filter", "alpha(opacity = 80)")
+		.css("display", "none")
+		.appendTo(outerDiv);
+});
+
+
+</script>
+
+
+<div id="installer-import" class="clearfix">
+<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal form-validate">
+
+
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+
+	<?php if ($this->hasPackage && ComponentbuilderHelper::checkArray($this->headerList) && ComponentbuilderHelper::checkArray($this->headers)) : ?>
+		<fieldset class="uploadform">
+			<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
+			<div class="control-group">
+				<label class="control-label" ><h4><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_TABLE_COLUMNS'); ?></h4></label>
+				<div class="controls">
+					<label class="control-label" ><h4><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FILE_COLUMNS'); ?></h4></label>
+				</div>
+			</div>
+			<?php foreach($this->headerList as $name => $title): ?>
+				<div class="control-group">
+					<label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
+					<div class="controls">
+						<select  name="<?php echo $name; ?>"  id="vdm_<?php echo $name; ?>" required class="required input_box" >
+							<option value=""><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
+							<option value="IGNORE"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_IGNORE_COLUMN'); ?></option>
+							<?php foreach($this->headers as $value => $option): ?>
+								<?php $selected = (strtolower($option) ==  strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
+								<option value="<?php echo ComponentbuilderHelper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ComponentbuilderHelper::htmlEscape($option); ?></option>
+							<?php endforeach; ?>
+						</select>
+					</div>
+				</div>
+			<?php endforeach; ?>
+			<div class="form-actions">
+				<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
+			</div>
+		</fieldset>
+		<input type="hidden" name="gettype" value="continue" />
+	<?php else: ?>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_UPLOAD', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_package" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE'); ?></label>
+					<div class="controls">
+						<input class="input_box" id="import_package" name="import_package" type="file" size="57" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_DIRECTORY', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_directory" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+				</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_URL', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_url" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_URL'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<input type="hidden" name="gettype" value="upload" />
+	<?php endif; ?>
+	<input type="hidden" name="task" value="import_language_translations.import" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
+</div>

admin/views/import_language_translations/tmpl/index.html

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

admin/views/import_language_translations/view.html.php

@@ -0,0 +1,109 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		view.html.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla view library
+jimport('joomla.application.component.view');
+
+/**
+ * Componentbuilder Import_language_translations View
+ */
+class ComponentbuilderViewImport_language_translations extends JViewLegacy
+{
+	protected $headerList;
+	protected $hasPackage = false;
+	protected $headers;
+	protected $hasHeader = 0;
+	protected $dataType;
+
+	public function display($tpl = null)
+	{
+		if ($this->getLayout() !== 'modal')
+		{
+			// Include helper submenu
+			ComponentbuilderHelper::addSubmenu('import');
+		}
+
+		$paths = new stdClass;
+		$paths->first = '';
+		$state = $this->get('state');
+
+		$this->paths = &$paths;
+		$this->state = &$state;
+		// get global action permissions
+		$this->canDo = ComponentbuilderHelper::getActions('import');
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+
+		// get the session object
+		$session = JFactory::getSession();
+		// check if it has package
+		$this->hasPackage 	= $session->get('hasPackage', false);
+		$this->dataType 	= $session->get('dataType', false);
+		if($this->hasPackage && $this->dataType)
+		{
+			$this->headerList 	= json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true);
+			$this->headers 		= ComponentbuilderHelper::getFileHeaders($this->dataType);
+			// clear the data type
+			$session->clear('dataType');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors'))){
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display the template
+		parent::display($tpl);
+	}
+
+	/**
+	 * Setting the toolbar
+	 */
+	protected function addToolBar()
+	{
+		JToolBarHelper::title(JText::_('COM_COMPONENTBUILDER_IMPORT_TITLE'), 'upload');
+		JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=import_language_translations');
+
+		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
+		{
+			JToolBarHelper::preferences('com_componentbuilder');
+		}
+
+		// set help url for this view if found
+		$help_url = ComponentbuilderHelper::getHelpUrl('import_language_translations');
+		if (ComponentbuilderHelper::checkString($help_url))
+		{
+			   JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+		}
+	}
+}

admin/views/library/tmpl/edit.php

@@ -157,51 +157,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvvzy function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzy = jQuery("#jform_how").val();
-	vvvvvzy(how_vvvvvzy);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzy = jQuery("#jform_how").val();
-	vvvvvzy(how_vvvvvzy);
-
-});
-
-// #jform_how listeners for how_vvvvvzz function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzz = jQuery("#jform_how").val();
-	vvvvvzz(how_vvvvvzz);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzz = jQuery("#jform_how").val();
-	vvvvvzz(how_vvvvvzz);
-
-});
-
-// #jform_how listeners for how_vvvvwaa function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwaa = jQuery("#jform_how").val();
-	vvvvwaa(how_vvvvwaa);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwaa = jQuery("#jform_how").val();
-	vvvvwaa(how_vvvvwaa);
-
-});
-
 // #jform_how listeners for how_vvvvwab function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -262,18 +217,63 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwaf function
+// #jform_how listeners for how_vvvvwaf function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwaf = jQuery("#jform_how").val();
+	vvvvwaf(how_vvvvwaf);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwaf = jQuery("#jform_how").val();
+	vvvvwaf(how_vvvvwaf);
+
+});
+
+// #jform_how listeners for how_vvvvwag function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwag = jQuery("#jform_how").val();
+	vvvvwag(how_vvvvwag);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwag = jQuery("#jform_how").val();
+	vvvvwag(how_vvvvwag);
+
+});
+
+// #jform_how listeners for how_vvvvwah function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwah = jQuery("#jform_how").val();
+	vvvvwah(how_vvvvwah);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwah = jQuery("#jform_how").val();
+	vvvvwah(how_vvvvwah);
+
+});
+
+// #jform_type listeners for type_vvvvwai function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaf(type_vvvvwaf);
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(type_vvvvwai);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaf(type_vvvvwaf);
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(type_vvvvwai);
 
 });
 

componentbuilder.xml

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

@@ -339,4 +339,55 @@
 		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.11</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.11/JCB_v2.6.11.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.12</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.12/JCB_v2.6.12.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.13</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.13/JCB_v2.6.13.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3218,9 +3218,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","php_batchmove":"php_batchmove","type":"type","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getlistquery":"php_getlistquery","php_getitem":"php_getitem","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"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"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -3278,9 +3278,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","add_php_after_getitem":"add_php_after_getitem","view_table_main":"view_table_main","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","addcalculation":"addcalculation","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_table_main":"view_table_main","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_router_parse":"add_php_router_parse","add_php_after_getitem":"add_php_after_getitem","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","add_php_before_getitems","add_php_before_getitem","add_php_after_getitem","view_table_main","add_php_getlistquery","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","view_table_main","add_php_before_getitems","add_php_before_getitem","add_php_router_parse","add_php_after_getitem","add_php_getlistquery","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Set the object into the content types table.
 			$dynamic_get_Inserted = $db->insertObject('#__content_types', $dynamic_get);
@@ -3645,9 +3645,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","php_batchmove":"php_batchmove","type":"type","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getlistquery":"php_getlistquery","php_getitem":"php_getitem","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","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_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"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"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"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"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -3790,9 +3790,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","addcalculation":"addcalculation","add_php_after_getitem":"add_php_after_getitem","view_table_main":"view_table_main","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","db_table_main":"db_table_main","db_selection":"db_selection","addcalculation":"addcalculation","php_custom_get":"php_custom_get","add_php_after_getitems":"add_php_after_getitems","view_table_main":"view_table_main","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_router_parse":"add_php_router_parse","add_php_after_getitem":"add_php_after_getitem","add_php_getlistquery":"add_php_getlistquery","getcustom":"getcustom","php_before_getitem":"php_before_getitem","pagination":"pagination","php_after_getitem":"php_after_getitem","not_required":"not_required","php_getlistquery":"php_getlistquery","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","add_php_before_getitems","add_php_before_getitem","add_php_after_getitem","view_table_main","add_php_getlistquery","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.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","main_source","gettype","add_php_after_getitems","view_table_main","add_php_before_getitems","add_php_before_getitem","add_php_router_parse","add_php_after_getitem","add_php_getlistquery","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Check if dynamic_get type is already in content_type DB.
 			$dynamic_get_id = null;
@@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.6.10 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.6.13 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }

site/helpers/componentbuilder.php

@@ -720,678 +720,7 @@ abstract class ComponentbuilderHelper
 		}
 		return false;		
 	}
-			
-	public static function getImportScripts($type, $fieldName = false)
-	{
-		// if field name is pased the convert to type
-		if ($fieldName)
-		{
-			$fieldNames = array(
-				'php_import_display' => 'display',
-				'php_import_setdata' => 'setdata',
-				'php_import_save' => 'save',
-				'html_import_view' => 'view',
-				'php_import' => 'import',
-				'php_import_ext' => 'ext'
-			);
-			// first check if the field name is found
-			if (isset($fieldNames[$type]))
-			{
-				$type = $fieldNames[$type];
-			}
-			else
-			{
-				return '';
-			}
-		}
-		$script = array();
-		if ('display' === $type)
-		{
-			// set the display script
-			$script['display'][] = "\tprotected \$headerList;";
-			$script['display'][] = "\tprotected \$hasPackage = false;";
-			$script['display'][] = "\tprotected \$headers;";
-			$script['display'][] = "\tprotected \$hasHeader = 0;";
-			$script['display'][] = "\tprotected \$dataType;";
-			$script['display'][] = "\n\tpublic function display(\$tpl = null)";
-			$script['display'][] = "\t{";
-			$script['display'][] = "\t\tif (\$this->getLayout() !== 'modal')";
-			$script['display'][] = "\t\t{";
-			$script['display'][] = "\t\t\t// Include helper submenu";
-			$script['display'][] = "\t\t\t###-#-#-Component###Helper::addSubmenu('import');";
-			$script['display'][] = "\t\t}";
-			$script['display'][] = "\n\t\t\$paths = new stdClass;";
-			$script['display'][] = "\t\t\$paths->first = '';";
-			$script['display'][] = "\t\t\$state = \$this->get('state');";
-			$script['display'][] = "\n\t\t\$this->paths = &\$paths;";
-			$script['display'][] = "\t\t\$this->state = &\$state;";
-			$script['display'][] = "\t\t// get global action permissions";
-			$script['display'][] = "\t\t\$this->canDo = ###-#-#-Component###Helper::getActions('import');";
-			$script['display'][] = "\n\t\t// We don't need toolbar in the modal window.";
-			$script['display'][] = "\t\tif (\$this->getLayout() !== 'modal')";
-			$script['display'][] = "\t\t{";
-			$script['display'][] = "\t\t\t\$this->addToolbar();";
-			$script['display'][] = "\t\t\t\$this->sidebar = JHtmlSidebar::render();";
-			$script['display'][] = "\t\t}";
-			$script['display'][] = "\n\t\t// get the session object";
-			$script['display'][] = "\t\t\$session = JFactory::getSession();";
-			$script['display'][] = "\t\t// check if it has package";
-			$script['display'][] = "\t\t\$this->hasPackage \t= \$session->get('hasPackage', false);";
-			$script['display'][] = "\t\t\$this->dataType \t= \$session->get('dataType', false);";
-			$script['display'][] = "\t\tif(\$this->hasPackage && \$this->dataType)";
-			$script['display'][] = "\t\t{";
-			$script['display'][] = "\t\t\t\$this->headerList \t= json_decode(\$session->get(\$this->dataType.'_VDM_IMPORTHEADERS', false),true);";
-			$script['display'][] = "\t\t\t\$this->headers \t\t= ###-#-#-Component###Helper::getFileHeaders(\$this->dataType);";
-			$script['display'][] = "\t\t\t// clear the data type";
-			$script['display'][] = "\t\t\t\$session->clear('dataType');";
-			$script['display'][] = "\t\t}";
-			$script['display'][] = "\n\t\t// Check for errors.";
-			$script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){";
-			$script['display'][] = "\t\t\tthrow new Exception(implode(".'"\n", $errors), 500);';
-			$script['display'][] = "\t\t}";
-			$script['display'][] = "\n\t\t// Display the template";
-			$script['display'][] = "\t\tparent::display(\$tpl);";
-			$script['display'][] = "\t}";
-		}
-		elseif ('setdata' === $type)
-		{
-			// set the setdata script
-			$script['setdata'] = array();
-			$script['setdata'][] = "\t/**";
-			$script['setdata'][] = "\t* Set the data from the spreadsheet to the database";
-			$script['setdata'][] = "\t*";
-			$script['setdata'][] = "\t* @param string  \$package Paths to the uploaded package file";
-			$script['setdata'][] = "\t*";
-			$script['setdata'][] = "\t* @return  boolean false on failure";
-			$script['setdata'][] = "\t*";
-			$script['setdata'][] = "\t**/";
-			$script['setdata'][] = "\tprotected function setData(\$package,\$table,\$target_headers)";
-			$script['setdata'][] = "\t{";
-			$script['setdata'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$target_headers))";
-			$script['setdata'][] = "\t\t{";
-			$script['setdata'][] = "\t\t\t// make sure the file is loaded\t\t";
-			$script['setdata'][] = "\t\t\tJLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');";
-			$script['setdata'][] = "\t\t\t\$jinput = JFactory::getApplication()->input;";
-			$script['setdata'][] = "\t\t\tforeach(\$target_headers as \$header)";
-			$script['setdata'][] = "\t\t\t{";
-			$script['setdata'][] = "\t\t\t\t\$data['target_headers'][\$header] = \$jinput->getString(\$header, null);";
-			$script['setdata'][] = "\t\t\t}";
-			$script['setdata'][] = "\t\t\t// set the data";
-			$script['setdata'][] = "\t\t\tif(isset(\$package['dir']))";
-			$script['setdata'][] = "\t\t\t{";
-			$script['setdata'][] = "\t\t\t\t\$inputFileType = PHPExcel_IOFactory::identify(\$package['dir']);";
-			$script['setdata'][] = "\t\t\t\t\$excelReader = PHPExcel_IOFactory::createReader(\$inputFileType);";
-			$script['setdata'][] = "\t\t\t\t\$excelReader->setReadDataOnly(true);";
-			$script['setdata'][] = "\t\t\t\t\$excelObj = \$excelReader->load(\$package['dir']);";
-			$script['setdata'][] = "\t\t\t\t\$data['array'] = \$excelObj->getActiveSheet()->toArray(null, true,true,true);";
-			$script['setdata'][] = "\t\t\t\t\$excelObj->disconnectWorksheets();";
-			$script['setdata'][] = "\t\t\t\tunset(\$excelObj);";
-			$script['setdata'][] = "\t\t\t\treturn \$this->save(\$data,\$table);";
-			$script['setdata'][] = "\t\t\t}";
-			$script['setdata'][] = "\t\t}";
-			$script['setdata'][] = "\t\treturn false;";
-			$script['setdata'][] = "\t}";
-		}
-		elseif ('save' === $type)
-		{
-			$script['save'] = array();
-			$script['save'][] = "\t/**";
-			$script['save'][] = "\t* Save the data from the file to the database";
-			$script['save'][] = "\t*";
-			$script['save'][] = "\t* @param string  \$package Paths to the uploaded package file";
-			$script['save'][] = "\t*";
-			$script['save'][] = "\t* @return  boolean false on failure";
-			$script['save'][] = "\t*";
-			$script['save'][] = "\t**/";
-			$script['save'][] = "\tprotected function save(\$data,\$table)";
-			$script['save'][] = "\t{";
-			$script['save'][] = "\t\t// import the data if there is any";
-			$script['save'][] = "\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']))";
-			$script['save'][] = "\t\t{";
-			$script['save'][] = "\t\t\t// get user object";
-			$script['save'][] = "\t\t\t\$user  \t\t= JFactory::getUser();";
-			$script['save'][] = "\t\t\t// remove header if it has headers";
-			$script['save'][] = "\t\t\t\$id_key \t= \$data['target_headers']['id'];";
-			$script['save'][] = "\t\t\t\$published_key \t= \$data['target_headers']['published'];";
-			$script['save'][] = "\t\t\t\$ordering_key \t= \$data['target_headers']['ordering'];";
-			$script['save'][] = "\t\t\t// get the first array set";
-			$script['save'][] = "\t\t\t\$firstSet = reset(\$data['array']);";
-			$script['save'][] = "";
-			$script['save'][] = "\t\t\t// check if first array is a header array and remove if true";
-			$script['save'][] = "\t\t\tif(\$firstSet[\$id_key] == 'id' || \$firstSet[\$published_key] == 'published' || \$firstSet[\$ordering_key] == 'ordering')";
-			$script['save'][] = "\t\t\t{";
-			$script['save'][] = "\t\t\t\tarray_shift(\$data['array']);";
-			$script['save'][] = "\t\t\t}";
-			$script['save'][] = "\t\t\t";
-			$script['save'][] = "\t\t\t// make sure there is still values in array and that it was not only headers";
-			$script['save'][] = "\t\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']) && \$user->authorise(\$table.'.import', 'com_###-#-#-component###') && \$user->authorise('core.import', 'com_###-#-#-component###'))";
-			$script['save'][] = "\t\t\t{";
-			$script['save'][] = "\t\t\t\t// set target.";
-			$script['save'][] = "\t\t\t\t\$target\t= array_flip(\$data['target_headers']);";
-			$script['save'][] = "\t\t\t\t// Get a db connection.";
-			$script['save'][] = "\t\t\t\t\$db = JFactory::getDbo();";
-			$script['save'][] = "\t\t\t\t// set some defaults";
-			$script['save'][] = "\t\t\t\t\$todayDate\t\t= JFactory::getDate()->toSql();";
-			$script['save'][] = "\t\t\t\t// get global action permissions";
-			$script['save'][] = "\t\t\t\t\$canDo\t\t\t= ###-#-#-Component###Helper::getActions(\$table);";
-			$script['save'][] = "\t\t\t\t\$canEdit\t\t= \$canDo->get('core.edit');";
-			$script['save'][] = "\t\t\t\t\$canState\t\t= \$canDo->get('core.edit.state');";
-			$script['save'][] = "\t\t\t\t\$canCreate\t\t= \$canDo->get('core.create');";
-			$script['save'][] = "\t\t\t\t\$hasAlias\t\t= \$this->getAliasesUsed(\$table);";
-			$script['save'][] = "\t\t\t\t// prosses the data";
-			$script['save'][] = "\t\t\t\tforeach(\$data['array'] as \$row)";
-			$script['save'][] = "\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\$found = false;";
-			$script['save'][] = "\t\t\t\t\tif (isset(\$row[\$id_key]) && is_numeric(\$row[\$id_key]) && \$row[\$id_key] > 0)";
-			$script['save'][] = "\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t// raw items import & update!";
-			$script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);";
-			$script['save'][] = "\t\t\t\t\t\t\$query";
-			$script['save'][] = "\t\t\t\t\t\t\t->select('version')";
-			$script['save'][] = "\t\t\t\t\t\t\t->from(\$db->quoteName('#__###-#-#-component###_'.\$table))";
-			$script['save'][] = "\t\t\t\t\t\t\t->where(\$db->quoteName('id') . ' = '. \$db->quote(\$row[\$id_key]));";
-			$script['save'][] = "\t\t\t\t\t\t// Reset the query using our newly populated query object.";
-			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
-			$script['save'][] = "\t\t\t\t\t\t\$db->execute();";
-			$script['save'][] = "\t\t\t\t\t\t\$found = \$db->getNumRows();";
-			$script['save'][] = "\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t";
-			$script['save'][] = "\t\t\t\t\tif(\$found && \$canEdit)";
-			$script['save'][] = "\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t// update item";
-			$script['save'][] = "\t\t\t\t\t\t\$id \t\t= \$row[\$id_key];";
-			$script['save'][] = "\t\t\t\t\t\t\$version\t= \$db->loadResult();";
-			$script['save'][] = "\t\t\t\t\t\t// reset all buckets";
-			$script['save'][] = "\t\t\t\t\t\t\$query \t\t= \$db->getQuery(true);";
-			$script['save'][] = "\t\t\t\t\t\t\$fields \t= array();";
-			$script['save'][] = "\t\t\t\t\t\t// Fields to update.";
-			$script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)";
-			$script['save'][] = "\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t// ignore column";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update modified";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('modified_by' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update modified";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('modified' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update version";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = (int) \$version + 1;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// verify publish authority";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('published' == \$target[\$key] && !\$canState)";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// set to update array";
-			$script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$cell;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$db->quote(\$cell);";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . \" = ''\";";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t// load the defaults";
-			$script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified_by') . ' = ' . \$db->quote(\$user->id);";
-			$script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified') . ' = ' . \$db->quote(\$todayDate);";
-			$script['save'][] = "\t\t\t\t\t\t// Conditions for which records should be updated.";
-			$script['save'][] = "\t\t\t\t\t\t\$conditions = array(";
-			$script['save'][] = "\t\t\t\t\t\t\t\$db->quoteName('id') . ' = ' . \$id";
-			$script['save'][] = "\t\t\t\t\t\t);";
-			$script['save'][] = "\t\t\t\t\t\t";
-			$script['save'][] = "\t\t\t\t\t\t\$query->update(\$db->quoteName('#__###-#-#-component###_'.\$table))->set(\$fields)->where(\$conditions);";
-			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
-			$script['save'][] = "\t\t\t\t\t\t\$db->execute();";
-			$script['save'][] = "\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\telseif (\$canCreate)";
-			$script['save'][] = "\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t// insert item";
-			$script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);";
-			$script['save'][] = "\t\t\t\t\t\t// reset all buckets";
-			$script['save'][] = "\t\t\t\t\t\t\$columns \t= array();";
-			$script['save'][] = "\t\t\t\t\t\t\$values \t= array();";
-			$script['save'][] = "\t\t\t\t\t\t\$version\t= false;";
-			$script['save'][] = "\t\t\t\t\t\t// Insert columns. Insert values.";
-			$script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)";
-			$script['save'][] = "\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t// ignore column";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// remove id";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('id' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update created";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('created_by' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update created";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('created' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// Make sure the alias is incremented";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('alias' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = \$this->getAlias(\$cell,\$table);";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// update version";
-			$script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = 1;";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$version = true;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\t// set to insert array";
-			$script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$cell;";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$db->quote(\$cell);";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))";
-			$script['save'][] = "\t\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
-			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \"''\";";
-			$script['save'][] = "\t\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t// load the defaults";
-			$script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created_by';";
-			$script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$user->id);";
-			$script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created';";
-			$script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$todayDate);";
-			$script['save'][] = "\t\t\t\t\t\tif (!\$version)";
-			$script['save'][] = "\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\$columns[] \t= 'version';";
-			$script['save'][] = "\t\t\t\t\t\t\t\$values[] \t= 1;";
-			$script['save'][] = "\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t\t// Prepare the insert query.";
-			$script['save'][] = "\t\t\t\t\t\t\$query";
-			$script['save'][] = "\t\t\t\t\t\t\t->insert(\$db->quoteName('#__###-#-#-component###_'.\$table))";
-			$script['save'][] = "\t\t\t\t\t\t\t->columns(\$db->quoteName(\$columns))";
-			$script['save'][] = "\t\t\t\t\t\t\t->values(implode(',', \$values));";
-			$script['save'][] = "\t\t\t\t\t\t// Set the query using our newly populated query object and execute it.";
-			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
-			$script['save'][] = "\t\t\t\t\t\t\$done = \$db->execute();";
-			$script['save'][] = "\t\t\t\t\t\tif (\$done)";
-			$script['save'][] = "\t\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\t\t\$aId = \$db->insertid();";
-			$script['save'][] = "\t\t\t\t\t\t\t// make sure the access of asset is set";
-			$script['save'][] = "\t\t\t\t\t\t\t###-#-#-Component###Helper::setAsset(\$aId,\$table);";
-			$script['save'][] = "\t\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t\telse";
-			$script['save'][] = "\t\t\t\t\t{";
-			$script['save'][] = "\t\t\t\t\t\treturn false;";
-			$script['save'][] = "\t\t\t\t\t}";
-			$script['save'][] = "\t\t\t\t}";
-			$script['save'][] = "\t\t\t\treturn true;";
-			$script['save'][] = "\t\t\t}";
-			$script['save'][] = "\t\t}";
-			$script['save'][] = "\t\treturn false;";
-			$script['save'][] = "\t}";
-		}
-		elseif ('view' === $type)
-		{
-			$script['view'] = array();
-			$script['view'][] = "<script type=\"text/javascript\">";
-			$script['view'][] = "<?php if (\$this->hasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList)) : ?>";
-			$script['view'][] = "\tJoomla.continueImport = function()";
-			$script['view'][] = "\t{";
-			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
-			$script['view'][] = "\t\tvar error = false;";
-			$script['view'][] = "\t\tvar therequired = [<?php \$i = 0; foreach(\$this->headerList as \$name => \$title) { echo (\$i != 0)? ', \"vdm_'.\$name.'\"':'\"vdm_'.\$name.'\"'; \$i++; } ?>];";
-			$script['view'][] = "\t\tfor(i = 0; i < therequired.length; i++)";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\tif(jQuery('#'+therequired[i]).val() == \"\" )";
-			$script['view'][] = "\t\t\t{";
-			$script['view'][] = "\t\t\t\terror = true;";
-			$script['view'][] = "\t\t\t\tbreak;";
-			$script['view'][] = "\t\t\t}";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t\t// do field validation";
-			$script['view'][] = "\t\tif (error)";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>\");";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t\telse";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t\tform.gettype.value = 'continue';";
-			$script['view'][] = "\t\t\tform.submit();";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t};";
-			$script['view'][] = "<?php else: ?>";
-			$script['view'][] = "\tJoomla.submitbutton = function()";
-			$script['view'][] = "\t{";
-			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t// do field validation";
-			$script['view'][] = "\t\tif (form.import_package.value == \"\")";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>\");";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t\telse";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t\tform.gettype.value = 'upload';";
-			$script['view'][] = "\t\t\tform.submit();";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t};";
-			$script['view'][] = "";
-			$script['view'][] = "\n\tJoomla.submitbutton3 = function()";
-			$script['view'][] = "\t{";
-			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t// do field validation";
-			$script['view'][] = "\t\tif (form.import_directory.value == \"\"){";
-			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>\");";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t\telse";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t\tform.gettype.value = 'folder';";
-			$script['view'][] = "\t\t\tform.submit();";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t};";
-			$script['view'][] = "";
-			$script['view'][] = "\n\tJoomla.submitbutton4 = function()";
-			$script['view'][] = "\t{";
-			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t// do field validation";
-			$script['view'][] = "\t\tif (form.import_url.value == \"\" || form.import_url.value == \"http://\")";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_ENTER_A_URL', true); ?>\");";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t\telse";
-			$script['view'][] = "\t\t{";
-			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t\tform.gettype.value = 'url';";
-			$script['view'][] = "\t\t\tform.submit();";
-			$script['view'][] = "\t\t}";
-			$script['view'][] = "\t};";
-			$script['view'][] = "<?php endif; ?>";
-			$script['view'][] = "";
-			$script['view'][] = "\n// Add spindle-wheel for importations:";
-			$script['view'][] = "jQuery(document).ready(function(\$) {";
-			$script['view'][] = "\tvar outerDiv = \$('body');";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\$('<div id=\"loading\"></div>')";
-			$script['view'][] = "\t\t.css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_###-#-#-component###/assets/images/import.gif') 50% 15% no-repeat\")";
-			$script['view'][] = "\t\t.css(\"top\", outerDiv.position().top - \$(window).scrollTop())";
-			$script['view'][] = "\t\t.css(\"left\", outerDiv.position().left - \$(window).scrollLeft())";
-			$script['view'][] = "\t\t.css(\"width\", outerDiv.width())";
-			$script['view'][] = "\t\t.css(\"height\", outerDiv.height())";
-			$script['view'][] = "\t\t.css(\"position\", \"fixed\")";
-			$script['view'][] = "\t\t.css(\"opacity\", \"0.80\")";
-			$script['view'][] = "\t\t.css(\"-ms-filter\", \"progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)\")";
-			$script['view'][] = "\t\t.css(\"filter\", \"alpha(opacity = 80)\")";
-			$script['view'][] = "\t\t.css(\"display\", \"none\")";
-			$script['view'][] = "\t\t.appendTo(outerDiv);";
-			$script['view'][] = "});";
-			$script['view'][] = "";
-			$script['view'][] = "\n</script>";
-			$script['view'][] = "";
-			$script['view'][] = "\n<div id=\"installer-import\" class=\"clearfix\">";
-			$script['view'][] = "<form enctype=\"multipart/form-data\" action=\"<?php echo JRoute::_('index.php?option=com_###-#-#-component###&view=import_###-#-#-views###');?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t<?php if (!empty( \$this->sidebar)) : ?>";
-			$script['view'][] = "\t\t<div id=\"j-sidebar-container\" class=\"span2\">";
-			$script['view'][] = "\t\t\t<?php echo \$this->sidebar; ?>";
-			$script['view'][] = "\t\t</div>";
-			$script['view'][] = "\t\t<div id=\"j-main-container\" class=\"span10\">";
-			$script['view'][] = "\t<?php else : ?>";
-			$script['view'][] = "\t\t<div id=\"j-main-container\">";
-			$script['view'][] = "\t<?php endif;?>";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t<?php if (\$this->hasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList) && ###-#-#-Component###Helper::checkArray(\$this->headers)) : ?>";
-			$script['view'][] = "\t\t<fieldset class=\"uploadform\">";
-			$script['view'][] = "\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>";
-			$script['view'][] = "\t\t\t<div class=\"control-group\">";
-			$script['view'][] = "\t\t\t\t<label class=\"control-label\" ><h4><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>";
-			$script['view'][] = "\t\t\t\t<div class=\"controls\">";
-			$script['view'][] = "\t\t\t\t\t<label class=\"control-label\" ><h4><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t</div>";
-			$script['view'][] = "\t\t\t<?php foreach(\$this->headerList as \$name => \$title): ?>";
-			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
-			$script['view'][] = "\t\t\t\t\t<label for=\"<?php echo \$name; ?>\" class=\"control-label\" ><?php echo \$title; ?></label>";
-			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
-			$script['view'][] = "\t\t\t\t\t\t<select  name=\"<?php echo \$name; ?>\"  id=\"vdm_<?php echo \$name; ?>\" required class=\"required input_box\" >";
-			$script['view'][] = "\t\t\t\t\t\t\t<option value=\"\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>";
-			$script['view'][] = "\t\t\t\t\t\t\t<option value=\"IGNORE\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>";
-			$script['view'][] = "\t\t\t\t\t\t\t<?php foreach(\$this->headers as \$value => \$option): ?>";
-			$script['view'][] = "\t\t\t\t\t\t\t\t<?php \$selected = (strtolower(\$option) ==  strtolower (\$title) || strtolower(\$option) == strtolower(\$name))? 'selected=\"selected\"':''; ?>";
-			$script['view'][] = "\t\t\t\t\t\t\t\t<option value=\"<?php echo ###-#-#-Component###Helper::htmlEscape(\$value); ?>\" class=\"required\" <?php echo \$selected ?>><?php echo ###-#-#-Component###Helper::htmlEscape(\$option); ?></option>";
-			$script['view'][] = "\t\t\t\t\t\t\t<?php endforeach; ?>";
-			$script['view'][] = "\t\t\t\t\t\t</select>";
-			$script['view'][] = "\t\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t<?php endforeach; ?>";
-			$script['view'][] = "\t\t\t<div class=\"form-actions\">";
-			$script['view'][] = "\t\t\t\t<input class=\"btn btn-primary\" type=\"button\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_CONTINUE'); ?>\" onclick=\"Joomla.continueImport()\" />";
-			$script['view'][] = "\t\t\t</div>";
-			$script['view'][] = "\t\t</fieldset>";
-			$script['view'][] = "\t\t<input type=\"hidden\" name=\"gettype\" value=\"continue\" />";
-			$script['view'][] = "\t<?php else: ?>";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>";
-			$script['view'][] = "\t\t";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>";
-			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
-			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
-			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
-			$script['view'][] = "\t\t\t\t\t<label for=\"import_package\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE'); ?></label>";
-			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
-			$script['view'][] = "\t\t\t\t\t\t<input class=\"input_box\" id=\"import_package\" name=\"import_package\" type=\"file\" size=\"57\" />";
-			$script['view'][] = "\t\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
-			$script['view'][] = "\t\t\t\t\t<input class=\"btn btn-primary\" type=\"button\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>\" onclick=\"Joomla.submitbutton()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t</fieldset>";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
-			$script['view'][] = "\t\t";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>";
-			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
-			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
-			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
-			$script['view'][] = "\t\t\t\t\t<label for=\"import_directory\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>";
-			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
-			$script['view'][] = "\t\t\t\t\t\t<input type=\"text\" id=\"import_directory\" name=\"import_directory\" class=\"span5 input_box\" size=\"70\" value=\"<?php echo \$this->state->get('import.directory'); ?>\" />";
-			$script['view'][] = "\t\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
-			$script['view'][] = "\t\t\t\t\t<input type=\"button\" class=\"btn btn-primary\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_GET_BOTTON'); ?>\" onclick=\"Joomla.submitbutton3()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t</fieldset>";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
-			$script['view'][] = "";
-			$script['view'][] = "\n\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_URL', true)); ?>";
-			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
-			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
-			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
-			$script['view'][] = "\t\t\t\t\t<label for=\"import_url\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>";
-			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
-			$script['view'][] = "\t\t\t\t\t\t<input type=\"text\" id=\"import_url\" name=\"import_url\" class=\"span5 input_box\" size=\"70\" value=\"http://\" />";
-			$script['view'][] = "\t\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
-			$script['view'][] = "\t\t\t\t\t<input type=\"button\" class=\"btn btn-primary\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_GET_BOTTON'); ?>\" onclick=\"Joomla.submitbutton4()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
-			$script['view'][] = "\t\t\t\t</div>";
-			$script['view'][] = "\t\t\t</fieldset>";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
-			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTabSet'); ?>";
-			$script['view'][] = "\t\t<input type=\"hidden\" name=\"gettype\" value=\"upload\" />";
-			$script['view'][] = "\t<?php endif; ?>";
-			$script['view'][] = "\t<input type=\"hidden\" name=\"task\" value=\"import_###-#-#-views###.import\" />";
-			$script['view'][] = "\t<?php echo JHtml::_('form.token'); ?>";
-			$script['view'][] = "</form>";
-			$script['view'][] = "</div>";
-		}
-		elseif ('import' === $type)
-		{
-			$script['import'] = array();
-			$script['import'][] = "\t/**";
-			$script['import'][] = "\t * Import an spreadsheet from either folder, url or upload.";
-			$script['import'][] = "\t *";
-			$script['import'][] = "\t * @return  boolean result of import";
-			$script['import'][] = "\t *";
-			$script['import'][] = "\t */";
-			$script['import'][] = "\tpublic function import()";
-			$script['import'][] = "\t{";
-			$script['import'][] = "\t\t\$this->setState('action', 'import');";
-			$script['import'][] = "\t\t\$app \t\t= JFactory::getApplication();";
-			$script['import'][] = "\t\t\$session \t= JFactory::getSession();";
-			$script['import'][] = "\t\t\$package \t= null;";
-			$script['import'][] = "\t\t\$continue\t= false;";
-			$script['import'][] = "\t\t// get import type";
-			$script['import'][] = "\t\t\$this->getType = \$app->input->getString('gettype', NULL);";
-			$script['import'][] = "\t\t// get import type";
-			$script['import'][] = "\t\t\$this->dataType\t= \$session->get('dataType_VDM_IMPORTINTO', NULL);";
-			$script['import'][] = "\n\t\tif (\$package === null)";
-			$script['import'][] = "\t\t{";
-			$script['import'][] = "\t\t\tswitch (\$this->getType)";
-			$script['import'][] = "\t\t\t{";
-			$script['import'][] = "\t\t\t\tcase 'folder':";
-			$script['import'][] = "\t\t\t\t\t// Remember the 'Import from Directory' path.";
-			$script['import'][] = "\t\t\t\t\t\$app->getUserStateFromRequest(\$this->_context . '.import_directory', 'import_directory');";
-			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromFolder();";
-			$script['import'][] = "\t\t\t\t\tbreak;";
-			$script['import'][] = "\n\t\t\t\tcase 'upload':";
-			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUpload();";
-			$script['import'][] = "\t\t\t\t\tbreak;";
-			$script['import'][] = "\n\t\t\t\tcase 'url':";
-			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUrl();";
-			$script['import'][] = "\t\t\t\t\tbreak;";
-			$script['import'][] = "\n\t\t\t\tcase 'continue':";
-			$script['import'][] = "\t\t\t\t\t\$continue \t= true;";
-			$script['import'][] = "\t\t\t\t\t\$package\t= \$session->get('package', null);";
-			$script['import'][] = "\t\t\t\t\t\$package\t= json_decode(\$package, true);";
-			$script['import'][] = "\t\t\t\t\t// clear session";
-			$script['import'][] = "\t\t\t\t\t\$session->clear('package');";
-			$script['import'][] = "\t\t\t\t\t\$session->clear('dataType');";
-			$script['import'][] = "\t\t\t\t\t\$session->clear('hasPackage');";
-			$script['import'][] = "\t\t\t\t\tbreak;";
-			$script['import'][] = "\n\t\t\t\tdefault:";
-			$script['import'][] = "\t\t\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));";
-			$script['import'][] = "\n\t\t\t\t\treturn false;";
-			$script['import'][] = "\t\t\t\t\tbreak;";
-			$script['import'][] = "\t\t\t}";
-			$script['import'][] = "\t\t}";
-			$script['import'][] = "\t\t// Was the package valid?";
-			$script['import'][] = "\t\tif (!\$package || !\$package['type'])";
-			$script['import'][] = "\t\t{";
-			$script['import'][] = "\t\t\tif (in_array(\$this->getType, array('upload', 'url')))";
-			$script['import'][] = "\t\t\t{";
-			$script['import'][] = "\t\t\t\t\$this->remove(\$package['packagename']);";
-			$script['import'][] = "\t\t\t}";
-			$script['import'][] = "\n\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));";
-			$script['import'][] = "\t\t\treturn false;";
-			$script['import'][] = "\t\t}";
-			$script['import'][] = "\t\t";
-			$script['import'][] = "\t\t// first link data to table headers";
-			$script['import'][] = "\t\tif(!\$continue){";
-			$script['import'][] = "\t\t\t\$package\t= json_encode(\$package);";
-			$script['import'][] = "\t\t\t\$session->set('package', \$package);";
-			$script['import'][] = "\t\t\t\$session->set('dataType', \$this->dataType);";
-			$script['import'][] = "\t\t\t\$session->set('hasPackage', true);";
-			$script['import'][] = "\t\t\treturn true;";
-			$script['import'][] = "\t\t}";
-			$script['import'][] = "\t\t// set the data";
-			$script['import'][] = "\t\t\$headerList = json_decode(\$session->get(\$this->dataType.'_VDM_IMPORTHEADERS', false), true);";
-			$script['import'][] = "\t\tif (!\$this->setData(\$package,\$this->dataType,\$headerList))";
-			$script['import'][] = "\t\t{";
-			$script['import'][] = "\t\t\t// There was an error importing the package";
-			$script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_ERROR');";
-			$script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);";
-			$script['import'][] = "\t\t\tif (\$back)";
-			$script['import'][] = "\t\t\t{";
-			$script['import'][] = "\t\t\t\t\$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);";
-			$script['import'][] = "\t\t\t\t\$session->clear('backto_VDM_IMPORT');";
-			$script['import'][] = "\t\t\t}";
-			$script['import'][] = "\t\t\t\$result = false;";
-			$script['import'][] = "\t\t}";
-			$script['import'][] = "\t\telse";
-			$script['import'][] = "\t\t{";
-			$script['import'][] = "\t\t\t// Package imported sucessfully";
-			$script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::sprintf('COM_###-#-#-COMPONENT###_IMPORT_SUCCESS', \$package['packagename']);";
-			$script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);";
-			$script['import'][] = "\t\t\tif (\$back)";
-			$script['import'][] = "\t\t\t{";
-			$script['import'][] = "\t\t\t    \$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);";
-			$script['import'][] = "\t\t\t    \$session->clear('backto_VDM_IMPORT');";
-			$script['import'][] = "\t\t\t}";
-			$script['import'][] = "\t\t\t\$result = true;";
-			$script['import'][] = "\t\t}";
-			$script['import'][] = "\n\t\t// Set some model state values";
-			$script['import'][] = "\t\t\$app->enqueueMessage(\$msg);";
-			$script['import'][] = "\n\t\t// remove file after import";
-			$script['import'][] = "\t\t\$this->remove(\$package['packagename']);";
-			$script['import'][] = "\t\t\$session->clear(\$this->getType.'_VDM_IMPORTHEADERS');";
-			$script['import'][] = "\t\treturn \$result;";
-			$script['import'][] = "\t}";
-		}
-		elseif ('ext' === $type)
-		{
-			$script['ext'][] = "\t/**";
-			$script['ext'][] = "\t * Check the extension";
-			$script['ext'][] = "\t *";
-			$script['ext'][] = "\t * @param   string  \$file    Name of the uploaded file";
-			$script['ext'][] = "\t *";
-			$script['ext'][] = "\t * @return  boolean  True on success";
-			$script['ext'][] = "\t *";
-			$script['ext'][] = "\t */";
-			$script['ext'][] = "\tprotected function checkExtension(\$file)";
-			$script['ext'][] = "\t{";
-			$script['ext'][] = "\t\t// check the extention";
-			$script['ext'][] = "\t\tswitch(strtolower(pathinfo(\$file, PATHINFO_EXTENSION)))";
-			$script['ext'][] = "\t\t{";
-			$script['ext'][] = "\t\t\tcase 'xls':";
-			$script['ext'][] = "\t\t\tcase 'ods':";
-			$script['ext'][] = "\t\t\tcase 'csv':";
-			$script['ext'][] = "\t\t\treturn true;";
-			$script['ext'][] = "\t\t\tbreak;";
-			$script['ext'][] = "\t\t}";
-			$script['ext'][] = "\t\treturn false;";
-			$script['ext'][] = "\t}";
-		}
-		// return the needed script
-		if (isset($script[$type]))
-		{
-			return str_replace('-#-#-', '', implode("\n",$script[$type]));
-		}
-		return false;
-	}
-			
+
 	/**
 	* 	set the session defaults if not set
 	**/

site/router.php

@@ -234,7 +234,7 @@ function ComponentbuilderBuildRoute(&$query)
 
 function ComponentbuilderParseRoute($segments)
 {
-	$router = new ContentRouter;
+	$router = new ComponentbuilderRouter;
 
 	return $router->parse($segments);
 }