Added Dynamic Router Implementation to resolve gh-74

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.12) 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,13 +126,13 @@ 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*: 20th January, 2018
++ *Last Build*: 23rd January, 2018
-+ *Version*: 2.6.12
++ *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*: **180517**
++ *Line count*: **180832**
-+ *Field count*: **1573**
++ *Field count*: **1577**
-+ *File count*: **1160**
++ *File count*: **1161**
 + *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://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.12) 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,13 +126,13 @@ 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*: 20th January, 2018
++ *Last Build*: 23rd January, 2018
-+ *Version*: 2.6.12
++ *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*: **180517**
++ *Line count*: **180832**
-+ *Field count*: **1573**
++ *Field count*: **1577**
-+ *File count*: **1160**
++ *File count*: **1161**
 + *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

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/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
+	 * The array of queries for creating shared links
-	 */
+	 */	
-	protected $continueCalling = array();
+	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" .
+				'header' => "Content-Type: application/json\r\n".
-				"Authorization: Bearer " . $this->oauthToken,
+					"Authorization: Bearer ".$this->oauthToken,
-				'method' => "POST"
+				'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,
+		// do not run creat shared link this way
-			'Content-Type: application/json'
+		$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":
+			case "list_shared_links":
-				if (isset($data->url) && isset($data->path) && $this->storeSharedLink($this->fixPath($data->path), str_replace('?dl=0', '?dl=1', $data->url)))
+				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();
+			$path								= (isset($data->path)) ? $data->path : $data->path_lower;
-			$localListing['id'] = 0;
+			$localListing						= array();
-			$localListing['name'] = $this->mediaData[$path]['name'];
+			$localListing['id']					= 0;
-			$localListing['size'] = $this->mediaData[$path]['size'];
+			$localListing['name']				= $data->name;
-			$localListing['key'] = $path;
+			$localListing['size']				= $data->size;
-			$localListing['url'] = $url;
+			$localListing['key']				= $this->fixPath($path);
-			$localListing['build'] = $this->build;
+			$localListing['url']				= str_replace('?dl=0','?dl=1',$data->url);
-			$localListing['external_source'] = (int) $this->sourceID;
+			$localListing['build']				= $this->build;
-			// free some memory
+			$localListing['external_source']	= (int) $this->sourceID;
-			unset($this->mediaData[$path]);
 			// 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
+					// set based on first call
-					$this->mediaData[$this->fixPath($item->path_lower)] = array('name' => $item->name, 'size' => $item->size);
+					if ('get' === $this->firstCall)
-					// get the shared link
+					{
-					$this->query = array("path" => $item->path_lower);
+						// first check if shared link exist
-					$this->type = 'create_shared_link';
+						$this->query = array("path" => $item->path_lower);
-					if (!$this->makeCall())
+						// 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/a_Get.php

@@ -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/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
@@ -4816,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)
+			// get the main table name
-//			{
-//				$idView = false; // TODO we will keep an eye on this....
-//				$aliasView = false;
-//			}
 			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)
@@ -4842,6 +4863,7 @@ class Interpretation extends Fields
 								$viewTable = str_replace('#__' . $this->fileContentStatic['###component###'] . '_', '', $get['selection']['table']);
 							}
 						}
+						break;
 					}
 				}
 			}
@@ -4849,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]))";
@@ -4875,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]))";
@@ -4890,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)
@@ -8102,11 +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');
 
 			// 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(ComponentbuilderHelper::getImportScripts('headers'), $this->placeholders));
+				PHP_EOL . PHP_EOL . $this->setPlaceholders($header, $this->placeholders));
 		}
 		return $query;
 	}

admin/helpers/componentbuilder.php

@@ -158,7 +158,7 @@ abstract class ComponentbuilderHelper
 		return $object;
 	}
 			
-	public static function getImportScripts($type, $fieldName = false)
+	public static function getDynamicScripts($type, $fieldName = false)
 	{
 		// if field name is passed the convert to type
 		if ($fieldName)
@@ -196,7 +196,7 @@ abstract class ComponentbuilderHelper
 			$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\t[[[-#-#-Component]]]Helper::addSubmenu('import');";
 			$script['display'][] = "\t\t}";
 			$script['display'][] = "\n\t\t\$paths = new stdClass;";
 			$script['display'][] = "\t\t\$paths->first = '';";
@@ -204,7 +204,7 @@ abstract class ComponentbuilderHelper
 			$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'][] = "\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{";
@@ -219,7 +219,7 @@ abstract class ComponentbuilderHelper
 			$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\$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}";
@@ -245,7 +245,7 @@ abstract class ComponentbuilderHelper
 			$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\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');";
@@ -283,8 +283,8 @@ abstract class ComponentbuilderHelper
 			$script['headers'][] = "\t\t// Get a db connection.";
 			$script['headers'][] = "\t\t\$db = JFactory::getDbo();";
 			$script['headers'][] = "\t\t// get the columns";
-			$script['headers'][] = "\t\t\$columns = \$db->getTableColumns(\"#__###-#-#-component###_###-#-#-view###\");";
+			$script['headers'][] = "\t\t\$columns = \$db->getTableColumns(\"#__[[[-#-#-component]]]_[[[-#-#-view]]]\");";
-			$script['headers'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$columns))";
+			$script['headers'][] = "\t\tif ([[[-#-#-Component]]]Helper::checkArray(\$columns))";
 			$script['headers'][] = "\t\t{";
 			$script['headers'][] = "\t\t\t// remove the headers you don't import/export.";
 			$script['headers'][] = "\t\t\tunset(\$columns['asset_id']);";
@@ -314,7 +314,7 @@ abstract class ComponentbuilderHelper
 			$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\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();";
@@ -332,7 +332,7 @@ abstract class ComponentbuilderHelper
 			$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\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']);";
@@ -341,7 +341,7 @@ abstract class ComponentbuilderHelper
 			$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\$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');";
@@ -356,7 +356,7 @@ abstract class ComponentbuilderHelper
 			$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->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);";
@@ -423,7 +423,7 @@ abstract class ComponentbuilderHelper
 			$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\$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}";
@@ -499,7 +499,7 @@ abstract class ComponentbuilderHelper
 			$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->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.";
@@ -509,7 +509,7 @@ abstract class ComponentbuilderHelper
 			$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\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";
@@ -527,7 +527,7 @@ abstract class ComponentbuilderHelper
 		{
 			$script['view'] = array();
 			$script['view'][] = "<script type=\"text/javascript\">";
-			$script['view'][] = "<?php if (\$this->hasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList)) : ?>";
+			$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');";
@@ -544,7 +544,7 @@ abstract class ComponentbuilderHelper
 			$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\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{";
@@ -562,7 +562,7 @@ abstract class ComponentbuilderHelper
 			$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\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{";
@@ -579,7 +579,7 @@ abstract class ComponentbuilderHelper
 			$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\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{";
@@ -597,7 +597,7 @@ abstract class ComponentbuilderHelper
 			$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\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{";
@@ -614,7 +614,7 @@ abstract class ComponentbuilderHelper
 			$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(\"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())";
@@ -630,7 +630,7 @@ abstract class ComponentbuilderHelper
 			$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'][] = "<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\">";
@@ -641,13 +641,13 @@ abstract class ComponentbuilderHelper
 			$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'][] = "\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<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<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\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): ?>";
@@ -655,72 +655,72 @@ abstract class ComponentbuilderHelper
 			$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=\"\"><?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<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\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\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<?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<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<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\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<?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<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<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\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'][] = "\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<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<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\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<input type=\"hidden\" name=\"task\" value=\"import_[[[-#-#-views]]].import\" />";
 			$script['view'][] = "\t<?php echo JHtml::_('form.token'); ?>";
 			$script['view'][] = "</form>";
 			$script['view'][] = "</div>";
@@ -770,7 +770,7 @@ abstract class ComponentbuilderHelper
 			$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'][] = "\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}";
@@ -782,7 +782,7 @@ abstract class ComponentbuilderHelper
 			$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'][] = "\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";
@@ -799,11 +799,11 @@ abstract class ComponentbuilderHelper
 			$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\$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\$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;";
@@ -811,11 +811,11 @@ abstract class ComponentbuilderHelper
 			$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\$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    \$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;";
@@ -852,6 +852,23 @@ abstract class ComponentbuilderHelper
 			$script['ext'][] = "\t\treturn false;";
 			$script['ext'][] = "\t}";
 		}
+		elseif ('routerparse' === $type)
+		{
+			$script['routerparse'][] = "\t\t\t\t// default script in switch for this view";
+			$script['routerparse'][] = "\t\t\t\t\$vars['view'] = '[[[-#-#-sview]]]';";
+			$script['routerparse'][] = "\t\t\t\tif (is_numeric(\$segments[\$count-1]))";
+			$script['routerparse'][] = "\t\t\t\t{";
+			$script['routerparse'][] = "\t\t\t\t\t\$vars['id'] = (int) \$segments[\$count-1];";
+			$script['routerparse'][] = "\t\t\t\t}";
+			$script['routerparse'][] = "\t\t\t\telseif (\$segments[\$count-1])";
+			$script['routerparse'][] = "\t\t\t\t{";
+			$script['routerparse'][] = "\t\t\t\t\t\$id = \$this->getVar('[[[-#-#-sview]]]', \$segments[\$count-1], 'alias', 'id');";
+			$script['routerparse'][] = "\t\t\t\t\tif(\$id)";
+			$script['routerparse'][] = "\t\t\t\t\t{";
+			$script['routerparse'][] = "\t\t\t\t\t\t\$vars['id'] = \$id;";
+			$script['routerparse'][] = "\t\t\t\t\t}";
+			$script['routerparse'][] = "\t\t\t\t}";
+		}
 		// return the needed script
 		if (isset($script[$type]))
 		{

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

@@ -3209,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"
@@ -3381,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"
@@ -3413,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"

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

admin/models/forms/admin_view.js

@@ -1203,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');
@@ -1340,8 +1340,8 @@ function getTableColumns(fieldKey, table_, nr_){
 	}
 }
 
-function getImportScripts_server(typpe){
+function getDynamicScripts_server(typpe){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getImportScripts&format=json&vdm="+vastDevMod;
+	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;
 	}
@@ -1354,7 +1354,7 @@ 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();
@@ -1366,7 +1366,7 @@ function getImportScripts(id){
 		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);
 				}
@@ -1374,7 +1374,7 @@ 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);
 				}
@@ -1382,7 +1382,7 @@ function getImportScripts(id){
 		}
 		// set the headers method script
 		if(current_headers.length == 0){
-			getImportScripts_server('headers').done(function(result) {
+			getDynamicScripts_server('headers').done(function(result) {
 				if(result){
 					jQuery('textarea#jform_php_import_headers').val(result);
 				}
@@ -1390,7 +1390,7 @@ function getImportScripts(id){
 		}
 		// 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);
 				}
@@ -1398,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);
 				}
@@ -1406,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);
 				}
@@ -1414,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_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzuvzn_required = false;
+jform_vvvvvzxvzp_required = false;
-jform_vvvvvzvvzo_required = false;
+jform_vvvvvzyvzq_required = false;
-jform_vvvvvzvvzp_required = false;
+jform_vvvvvzyvzr_required = false;
-jform_vvvvvzvvzq_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
+// the vvvvvzx function
-function vvvvvzu(target_vvvvvzu)
+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_vvvvvzuvzn_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_vvvvvzuvzn_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_vvvvvzuvzn_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_vvvvvzuvzn_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
+// the vvvvvzy function
-function vvvvvzv(target_vvvvvzv)
+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_vvvvvzvvzo_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_vvvvvzvvzo_required = false;
+			jform_vvvvvzyvzq_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzvvzp_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_vvvvvzvvzp_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_vvvvvzvvzq_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_vvvvvzvvzq_required = false;
+			jform_vvvvvzyvzs_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzo_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_vvvvvzvvzo_required = true;
+			jform_vvvvvzyvzq_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzp_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_vvvvvzvvzp_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_vvvvvzvvzq_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_vvvvvzvvzq_required = true;
+			jform_vvvvvzyvzs_required = true;
 		}
 	}
 }
 
-// the vvvvvzw function
+// the vvvvvzz function
-function vvvvvzw(target_vvvvvzw,type_vvvvvzw)
+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
+// the vvvvwaa function
-function vvvvvzx(type_vvvvvzx,target_vvvvvzx)
+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

@@ -41,6 +41,8 @@ jform_vvvvvzsvzj_required = false;
 jform_vvvvvzsvzk_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
@@ -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)-->
+                <!-- Addcalculation Field. Type: Radio. (joomla)-->
-                <field type="note"
+                <field type="radio"
-                       name="note_calculation_items"
+                       name="addcalculation"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_LABEL"
-                       class="note_calculation_items" />
+                       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)-->
+                <!-- View_table_main Field. Type: Adminviews. (custom)-->
-                <field type="subform"
+                <field type="adminviews"
-                       name="join_view_table"
+                       name="view_table_main"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
-                       multiple="true"
+                       multiple="false"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
+                       required="true" />
-                       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_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"
+                       name="add_php_router_parse"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_LABEL"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_ROUTER_PARSE_LABEL"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_ADDCALCULATION_DESCRIPTION"
+                       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)-->
+                <!-- Note_calculation_items Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="adminviews"
+                <field type="note"
-                       name="view_table_main"
+                       name="note_calculation_items"
-                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
+                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+                       class="note_calculation_items" />
-                       multiple="false"
-                       required="true" />
                 <!-- 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)-->
+                <!-- Php_router_parse Field. Type: Textarea. (joomla)-->
-                <field type="note"
+                <field type="textarea"
-                       name="note_calculation_item"
+                       name="php_router_parse"
-                       description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION"
+                       label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_ROUTER_PARSE_LABEL"
-                       class="note_calculation_item" />
+                       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_vvvvwagvzt_required = false;
+jform_vvvvwajvzv_required = false;
-jform_vvvvwahvzu_required = false;
+jform_vvvvwakvzw_required = false;
-jform_vvvvwaivzv_required = false;
+jform_vvvvwalvzx_required = false;
-jform_vvvvwajvzw_required = false;
+jform_vvvvwamvzy_required = false;
-jform_vvvvwamvzx_required = false;
+jform_vvvvwapvzz_required = false;
-jform_vvvvwanvzy_required = false;
+jform_vvvvwaqwaa_required = false;
-jform_vvvvwaovzz_required = false;
+jform_vvvvwarwab_required = false;
-jform_vvvvwapwaa_required = false;
+jform_vvvvwaswac_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	vvvvwaj(datalenght_vvvvwaj);
 
-	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	vvvvwak(datadefault_vvvvwak);
 
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	vvvvwal(datatype_vvvvwal);
 
-	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	vvvvwam(datatype_vvvvwam);
 
-	var store_vvvvwak = jQuery("#jform_store").val();
+	var store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
-	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	vvvvwap(add_css_view_vvvvwap);
 
-	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	vvvvwaq(add_css_views_vvvvwaq);
 
-	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	vvvvwar(add_javascript_view_footer_vvvvwar);
 
-	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	vvvvwas(add_javascript_views_footer_vvvvwas);
 });
 
-// the vvvvwag function
+// the vvvvwaj function
-function vvvvwag(datalenght_vvvvwag)
+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 temp_vvvvwaj = datalenght_vvvvwaj;
-		var datalenght_vvvvwag = [];
+		var datalenght_vvvvwaj = [];
-		datalenght_vvvvwag.push(temp_vvvvwag);
+		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_vvvvwagvzt_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_vvvvwagvzt_required = false;
+			jform_vvvvwajvzv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwagvzt_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_vvvvwagvzt_required = true;
+			jform_vvvvwajvzv_required = true;
 		}
 	}
 }
 
-// the vvvvwag Some function
+// the vvvvwaj Some function
-function datalenght_vvvvwag_SomeFunc(datalenght_vvvvwag)
+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
+// the vvvvwak function
-function vvvvwah(datadefault_vvvvwah)
+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 temp_vvvvwak = datadefault_vvvvwak;
-		var datadefault_vvvvwah = [];
+		var datadefault_vvvvwak = [];
-		datadefault_vvvvwah.push(temp_vvvvwah);
+		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_vvvvwahvzu_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_vvvvwahvzu_required = false;
+			jform_vvvvwakvzw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwahvzu_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_vvvvwahvzu_required = true;
+			jform_vvvvwakvzw_required = true;
 		}
 	}
 }
 
-// the vvvvwah Some function
+// the vvvvwak Some function
-function datadefault_vvvvwah_SomeFunc(datadefault_vvvvwah)
+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
+// the vvvvwal function
-function vvvvwai(datatype_vvvvwai)
+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 temp_vvvvwal = datatype_vvvvwal;
-		var datatype_vvvvwai = [];
+		var datatype_vvvvwal = [];
-		datatype_vvvvwai.push(temp_vvvvwai);
+		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_vvvvwaivzv_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_vvvvwaivzv_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_vvvvwaivzv_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_vvvvwaivzv_required = true;
+			jform_vvvvwalvzx_required = true;
 		}
 	}
 }
 
-// the vvvvwai Some function
+// the vvvvwal Some function
-function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+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
+// the vvvvwam function
-function vvvvwaj(datatype_vvvvwaj)
+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 temp_vvvvwam = datatype_vvvvwam;
-		var datatype_vvvvwaj = [];
+		var datatype_vvvvwam = [];
-		datatype_vvvvwaj.push(temp_vvvvwaj);
+		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_vvvvwajvzw_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_vvvvwajvzw_required = false;
+			jform_vvvvwamvzy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvwajvzw_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_vvvvwajvzw_required = true;
+			jform_vvvvwamvzy_required = true;
 		}
 	}
 }
 
-// the vvvvwaj Some function
+// the vvvvwam Some function
-function datatype_vvvvwaj_SomeFunc(datatype_vvvvwaj)
+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
+// the vvvvwan function
-function vvvvwak(store_vvvvwak,datatype_vvvvwak)
+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 temp_vvvvwan = store_vvvvwan;
-		var store_vvvvwak = [];
+		var store_vvvvwan = [];
-		store_vvvvwak.push(temp_vvvvwak);
+		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 temp_vvvvwan = datatype_vvvvwan;
-		var datatype_vvvvwak = [];
+		var datatype_vvvvwan = [];
-		datatype_vvvvwak.push(temp_vvvvwak);
+		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
+// the vvvvwan Some function
-function store_vvvvwak_SomeFunc(store_vvvvwak)
+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
+// the vvvvwan Some function
-function datatype_vvvvwak_SomeFunc(datatype_vvvvwak)
+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
+// the vvvvwap function
-function vvvvwam(add_css_view_vvvvwam)
+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_vvvvwamvzx_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_vvvvwamvzx_required = false;
+			jform_vvvvwapvzz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwamvzx_required)
+		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_vvvvwamvzx_required = true;
+			jform_vvvvwapvzz_required = true;
 		}
 	}
 }
 
-// the vvvvwan function
+// the vvvvwaq function
-function vvvvwan(add_css_views_vvvvwan)
+function vvvvwaq(add_css_views_vvvvwaq)
 {
 	// set the function logic
-	if (add_css_views_vvvvwan == 1)
+	if (add_css_views_vvvvwaq == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwanvzy_required)
+		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_vvvvwanvzy_required = false;
+			jform_vvvvwaqwaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwanvzy_required)
+		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_vvvvwanvzy_required = true;
+			jform_vvvvwaqwaa_required = true;
 		}
 	}
 }
 
-// the vvvvwao function
+// the vvvvwar function
-function vvvvwao(add_javascript_view_footer_vvvvwao)
+function vvvvwar(add_javascript_view_footer_vvvvwar)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwao == 1)
+	if (add_javascript_view_footer_vvvvwar == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwaovzz_required)
+		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_vvvvwaovzz_required = false;
+			jform_vvvvwarwab_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaovzz_required)
+		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_vvvvwaovzz_required = true;
+			jform_vvvvwarwab_required = true;
 		}
 	}
 }
 
-// the vvvvwap function
+// the vvvvwas function
-function vvvvwap(add_javascript_views_footer_vvvvwap)
+function vvvvwas(add_javascript_views_footer_vvvvwas)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwap == 1)
+	if (add_javascript_views_footer_vvvvwas == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwapwaa_required)
+		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_vvvvwapwaa_required = false;
+			jform_vvvvwaswac_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwapwaa_required)
+		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_vvvvwapwaa_required = true;
+			jform_vvvvwaswac_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

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

admin/models/forms/library.js

@@ -23,21 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzzvzr_required = false;
+jform_vvvvwacvzt_required = false;
-jform_vvvvwafvzs_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();
+	var how_vvvvwaf = jQuery("#jform_how").val();
-	vvvvwaf(type_vvvvwaf);
+	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_vvvvvzzvzr_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_vvvvvzzvzr_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzr_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_vvvvvzzvzr_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('#jform_php_setdocument').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		if (jform_vvvvwacvzt_required)
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		{
+			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('#jform_php_setdocument').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		if (!jform_vvvvwacvzt_required)
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		{
+			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_display_library_config').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').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
+// the vvvvwah Some function
-function how_vvvvwae_SomeFunc(how_vvvvwae)
+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
+// the vvvvwai function
-function vvvvwaf(type_vvvvwaf)
+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_vvvvwafvzs_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_vvvvwafvzs_required = false;
+			jform_vvvvwaivzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwafvzs_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_vvvvwafvzs_required = true;
+			jform_vvvvwaivzu_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 getWaclinked_components()
+	public function getWaelinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/sql/install.mysql.utf8.sql

@@ -482,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 '',
@@ -503,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,
@@ -530,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.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/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();
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	vvvvwaj(datalenght_vvvvwaj);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
-	vvvvwag(datalenght_vvvvwag);
+	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();
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	vvvvwak(datadefault_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
-	vvvvwah(datadefault_vvvvwah);
+	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();
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	vvvvwal(datatype_vvvvwal);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwai(datatype_vvvvwai);
+	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();
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	vvvvwam(datatype_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwaj(datatype_vvvvwaj);
+	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 store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwak = jQuery("#jform_store").val();
+	var store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	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 store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	vvvvwan(store_vvvvwan,datatype_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwak = jQuery("#jform_store").val();
+	var store_vvvvwan = jQuery("#jform_store").val();
-	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+	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();
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	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();
+	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwam(add_css_view_vvvvwam);
+	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();
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	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();
+	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwan(add_css_views_vvvvwan);
+	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();
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	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();
+	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwao(add_javascript_view_footer_vvvvwao);
+	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();
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	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();
+	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwap(add_javascript_views_footer_vvvvwap);
+	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->wabfields = $this->get('Wabfields');
+		$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->waclinked_components = $this->get('Waclinked_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();
+	var location_vvvvwat = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwaq(location_vvvvwaq);
+	vvvvwat(location_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwat = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwaq(location_vvvvwaq);
+	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();
+	var location_vvvvwau = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwar(location_vvvvwar);
+	vvvvwau(location_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwau = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwar(location_vvvvwar);
+	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();
+	var type_vvvvwav = jQuery("#jform_type").val();
-	vvvvwas(type_vvvvwas);
+	vvvvwav(type_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwas = jQuery("#jform_type").val();
+	var type_vvvvwav = jQuery("#jform_type").val();
-	vvvvwas(type_vvvvwas);
+	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();
+	var type_vvvvwaw = jQuery("#jform_type").val();
-	vvvvwat(type_vvvvwat);
+	vvvvwaw(type_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwat = jQuery("#jform_type").val();
+	var type_vvvvwaw = jQuery("#jform_type").val();
-	vvvvwat(type_vvvvwat);
+	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();
+	var type_vvvvwax = jQuery("#jform_type").val();
-	vvvvwau(type_vvvvwau);
+	vvvvwax(type_vvvvwax);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwau = jQuery("#jform_type").val();
+	var type_vvvvwax = jQuery("#jform_type").val();
-	vvvvwau(type_vvvvwau);
+	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();
+	var target_vvvvway = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwav(target_vvvvwav);
+	vvvvway(target_vvvvway);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvway = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwav(target_vvvvwav);
+	vvvvway(target_vvvvway);
 
 });
 

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();
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaf(type_vvvvwaf);
+	vvvvwai(type_vvvvwai);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaf(type_vvvvwaf);
+	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>20th January, 2018</creationDate>
+	<creationDate>23rd 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.12</version>
+	<version>2.6.13</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.6.12)</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

@@ -373,4 +373,21 @@
 		<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">http://domain.com/demo.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

@@ -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);
@@ -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.12 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/router.php

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