updated the donation info

Major upgrade, to initiate front-end development for JCB. Little steps at a time forward.
fixed the getVars backward compatibility issue, Added replyto and replytoname to email helper, renamed the email helper class that builds the email table to setTableBody
2017-08-21 02:24:30 +01:00 · 2017-08-20 22:18:16 +01:00 · 2017-08-20 21:47:14 +01:00 · 2017-08-20 18:52:35 +01:00 · 2017-08-12 19:00:05 +01:00 · 2017-08-12 12:51:28 +01:00
339 changed files with 7315 additions and 950 deletions
--- a/README.md
+++ b/README.md
@ -1,14 +1,15 @@
-# Component Builder (2.4.7)
+# Joomla Component Builder (JCB)
+[![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)

 This is a [Joomla 3.x](http://www.joomla.org/) component.

- ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The Component Builder")
+ ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder")

 The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.

 Whether you're a seasoned [Joomla](http://www.joomla.org/) 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.4.7) 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.5.0) with **ALL** its features and **ALL** concepts totally open-source and free!

 Once installed upgrades are quick and easy via the default Joomla upgrade area.

@ -107,13 +108,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th June, 2017
-+ *Version*: 2.4.7
+ *Last Build*: 21st August, 2017
+ *Version*: 2.5.0
 + *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*: **106061**
-+ *File count*: **644**
-+ *Folder count*: **115**
+ *Line count*: **111648**
+ *File count*: **663**
+ *Folder count*: **117**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
@ -121,5 +122,6 @@ Component Builder is mapped as a component in itself on my local development env
 ## Donations

 Come on buy me a coffee :)
- * PayPal: pay@vdm.io
- * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh
+ * PayPal: [paypal.me/payvdm](https://www.paypal.me/payvdm)
+ * Bitcoin: 1FLxiT6wyxgZ3boeviLkYJ1DRpp41uzpxa
+ * Ethereum: 0x243392daa3c9c8bc841fcacf7c7f72541cb16823
--- a/admin/README.txt
+++ b/admin/README.txt
@ -1,14 +1,15 @@
-# Component Builder (2.4.7)
+# Joomla Component Builder (JCB)
+[![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)

 This is a [Joomla 3.x](http://www.joomla.org/) component.

- ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The Component Builder")
+ ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder")

 The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.

 Whether you're a seasoned [Joomla](http://www.joomla.org/) 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.4.7) 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.5.0) with **ALL** its features and **ALL** concepts totally open-source and free!

 Once installed upgrades are quick and easy via the default Joomla upgrade area.

@ -107,13 +108,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th June, 2017
-+ *Version*: 2.4.7
+ *Last Build*: 21st August, 2017
+ *Version*: 2.5.0
 + *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*: **106061**
-+ *File count*: **644**
-+ *Folder count*: **115**
+ *Line count*: **111648**
+ *File count*: **663**
+ *Folder count*: **117**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
@ -121,5 +122,6 @@ Component Builder is mapped as a component in itself on my local development env
 ## Donations

 Come on buy me a coffee :)
- * PayPal: pay@vdm.io
- * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh
+ * PayPal: [paypal.me/payvdm](https://www.paypal.me/payvdm)
+ * Bitcoin: 1FLxiT6wyxgZ3boeviLkYJ1DRpp41uzpxa
+ * Ethereum: 0x243392daa3c9c8bc841fcacf7c7f72541cb16823
--- a/admin/access.xml
+++ b/admin/access.xml
@ -101,6 +101,7 @@
 		<action name="help_document.export" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC" />
 		<action name="help_document.import" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC" />
 		<action name="help_document.submenu" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC" />
+		<action name="joomla_component.backup" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.export_components" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.import_components" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.access" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC" />
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
--- a/admin/assets/css/admin_view.css
+++ b/admin/assets/css/admin_view.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 111 of this MVC
-	@build			7th May, 2017
+	@build			17th July, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css
--- a/admin/assets/css/admin_views.css
+++ b/admin/assets/css/admin_views.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 111 of this MVC
-	@build			7th May, 2017
+	@build			17th July, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css
--- a/admin/assets/css/compiler.css
+++ b/admin/assets/css/compiler.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 49 of this MVC
-	@build			31st May, 2017
+	@version		@update number 53 of this MVC
+	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.css
--- a/admin/assets/css/custom_admin_view.css
+++ b/admin/assets/css/custom_admin_view.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 22 of this MVC
-	@build			1st March, 2017
+	@build			17th July, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css
--- a/admin/assets/css/custom_admin_views.css
+++ b/admin/assets/css/custom_admin_views.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 22 of this MVC
-	@build			1st March, 2017
+	@build			17th July, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
--- a/admin/assets/css/joomla_component.css
+++ b/admin/assets/css/joomla_component.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 338 of this MVC
-	@build			16th June, 2017
+	@version		@update number 355 of this MVC
+	@build			21st August, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.css
--- a/admin/assets/css/joomla_components.css
+++ b/admin/assets/css/joomla_components.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 338 of this MVC
-	@build			16th June, 2017
+	@version		@update number 355 of this MVC
+	@build			21st August, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.css
--- a/admin/assets/css/site_view.css
+++ b/admin/assets/css/site_view.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 51 of this MVC
-	@build			6th March, 2017
+	@build			17th July, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.css
--- a/admin/assets/css/site_views.css
+++ b/admin/assets/css/site_views.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 51 of this MVC
-	@build			6th March, 2017
+	@build			17th July, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.css
--- a/admin/assets/images/component-300.jpg
+++ b/admin/assets/images/component-300.jpg
--- a/admin/assets/images/vdm-component.jpg
+++ b/admin/assets/images/vdm-component.jpg
--- a/admin/compiler/joomla_3/DASHJViewLagacy.php
+++ b/admin/compiler/joomla_3/DASHJViewLagacy.php
@ -52,7 +52,10 @@ class ###Component###View###Component### extends JViewLegacy
 		// Assign data to the view
 		$this->icons			= $this->get('Icons');
 		$this->contributors		= ###Component###Helper::getContributors();###DASH_GET_CUSTOM_DATA###
-
+		
+		// get the manifest details of the component
+		$this->manifest = ###Component###Helper::manifest();
+		
 		// Set the toolbar
 		$this->addToolBar();

@ -87,15 +90,19 @@ class ###Component###View###Component### extends JViewLegacy
 	/**
 	 * Method to set up the document properties
 	 *
-	 *
 	 * @return void
 	 */
 	protected function setDocument()
 	{
 		$document = JFactory::getDocument();
-
+		
+		// add dashboard style sheets
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/dashboard.css");
-
+		
+		// set page title
 		$document->setTitle(JText::_('COM_###COMPONENT###_DASHBOARD'));
+		
+		// add manifest to page JavaScript
+		$document->addScriptDeclaration("var manifest = jQuery.parseJSON('" . json_encode($this->manifest) . "');", "text/javascript");
 	}
 }
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@ -157,7 +157,14 @@ abstract class ###Component###Helper
 			$query = $db->getQuery(true);

 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#_'.$main.'_'.$table));
+			if (empty($table))
+			{
+				$query->from($db->quoteName('#__'.$main));
+			}
+			else
+			{
+				$query->from($db->quoteName('#_'.$main.'_'.$table));
+			}
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@ -440,12 +447,20 @@ abstract class ###Component###Helper
 	**/
 	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = '###component###')
 	{
-		// load some joomla helpers
-		JLoader::import('joomla.application.component.model');
 		// load the model file
-		JLoader::import( $name, $path . '/models' );
-		// return instance
-		return JModelLegacy::getInstance( $name, $component.'Model' );
+		JModelLegacy::addIncludePath( $path . '/models' );
+		// get instance
+		$model = JModelLegacy::getInstance( $name, $component.'Model' );
+		// if model not found
+		if ($model == false)
+		{
+			// build class name
+			$class = $prefix.$name;
+			// initilize the model
+			new $class();
+			$model = JModelLegacy::getInstance($name, $prefix);
+		}
+		return $model;
 	}
 	
 	/**
@ -652,10 +667,16 @@ abstract class ###Component###Helper
 		return false;
 	}

+	// typo sorry!
 	public static function sorten($string, $length = 40, $addTip = true)
+	{
+		return self::shorten($string, $length, $addTip);
+	}
+
+	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
-        {
+		{
 			$initial = strlen($string);
 			$words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE);
 			$words_count = count($words);
@ -675,7 +696,7 @@ abstract class ###Component###Helper
 			$final	= strlen($newString);
 			if ($initial != $final && $addTip)
 			{
-				$title = self::sorten($string, 400 , false);
+				$title = self::shorten($string, 400 , false);
 				return '<span class="hasTip" title="'.$title.'" style="cursor:help">'.trim($newString).'...</span>';
 			}
 			elseif ($initial != $final && !$addTip)
@ -774,15 +795,15 @@ abstract class ###Component###Helper
                return '';
 	}

-        public static function htmlEscape($var, $charset = 'UTF-8', $sorten = false, $length = 40)
+        public static function htmlEscape($var, $charset = 'UTF-8', $shorten = false, $length = 40)
 	{
 		if (self::checkString($var))
 		{
 			$filter = new JFilterInput();
 			$string = $filter->clean(html_entity_decode(htmlentities($var, ENT_COMPAT, $charset)), 'HTML');
-			if ($sorten)
+			if ($shorten)
 			{
-                                return self::sorten($string,$length);
+                                return self::shorten($string,$length);
 			}
 			return $string;
                }
--- a/admin/compiler/joomla_3/Helper_email.php
+++ b/admin/compiler/joomla_3/Helper_email.php
@ -114,6 +114,8 @@ abstract class ###Component###Email
 			$sendmail	= $globalConf->get('sendmail');
 			$mailfrom	= $globalConf->get('mailfrom');
 			$fromname	= $globalConf->get('fromname');
+			$replyto	= $globalConf->get('replyto');
+			$replytoname	= $globalConf->get('replytoname');
 		}
 		else
 		{
@ -126,15 +128,15 @@ abstract class ###Component###Email
 			$sendmail	= $conf->get('sendmail');
 			$mailfrom	= $conf->get('mailfrom');
 			$fromname	= $conf->get('fromname');
-			$mailreply	= $conf->get('mailreply');
-			$replyname	= $conf->get('replyname');
+			$replyto	= $conf->get('replyto');
+			$replytoname	= $conf->get('replytoname');
+		}
 			
-			// set the global reply-to
-			if ($mailreply && $fromname)
-			{
-				$mail->ClearReplyTos();
-				$mail->addReplyTo( array( $mailreply, $replyname ) );
-			}
+		// set the global reply-to if found
+		if ($replyto && $replytoname)
+		{
+			$mail->ClearReplyTos();
+			$mail->addReplyTo( array( $replyto, $replytoname ) );
 		}

 		// Set global sender
@ -276,4 +278,74 @@ abstract class ###Component###Email
 		
 		return $sendmail;
 	}
+
+	/**
+	 * Set html text (in a row) and subject (as title) to a email table.
+	 *      do not use <p> instead use <br />
+	 *	in your html that you pass to this method
+	 *      since it is a table row it does not
+	 *      work well with paragraphs
+	 *
+	 * @return  string on success
+	 *
+	 */
+	public static function setTableBody($html, $subject)
+	{
+		$body = array();
+		$body[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">";
+		$body[] = "<html xmlns=\"http://www.w3.org/1999/xhtml\">";
+		$body[] = "<head>";
+		$body[] = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
+		$body[] = "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>";
+		$body[] = "<title>".$subject."</title>";
+		$body[] = "<style type=\"text/css\">";
+		$body[] = "#outlook a {padding:0;}";
+		$body[] = ".ExternalClass {width:100%;}";
+		$body[] = ".ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} ";
+		$body[] = "p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;} ";
+		$body[] = "table td {border-collapse: collapse;}";
+		$body[] = "table {border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }";
+		$body[] = "img {display: block; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic;}";
+		$body[] = "a img {border: none;}";
+		$body[] = "a {text-decoration: none; color: #000001;}";
+		$body[] = "a.phone {text-decoration: none; color: #000001 !important; pointer-events: auto; cursor: default;}";
+		$body[] = "span {font-size: 13px; line-height: 17px; font-family: monospace; color: #000001;}";
+		$body[] = "</style>";
+		$body[] = "<!--[if gte mso 9]>";
+		$body[] = "<style>";
+		$body[] = "/* Target Outlook 2007 and 2010 */";
+		$body[] = "</style>";
+		$body[] = "<![endif]-->";
+		$body[] = "</head>";
+		$body[] = "<body style=\"width:100%; margin:0; padding:0; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%;\">";
+		$body[] = "\n<!-- body wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" style=\"margin:0; padding:0; width:100%; line-height: 100% !important;\">";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\">";
+		$body[] = "<!-- edge wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" align=\"center\" width=\"800\" >";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\">";
+		$body[] = "<!-- content wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" align=\"center\" width=\"780\">";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\" style=\"vertical-align: top;\">";
+		$body[] = $html;
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / content wrapper -->";
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / edge wrapper -->";
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / page wrapper -->";
+		$body[] = "</body>";
+		$body[] = "</html>";
+
+		return implode("\n", $body);
+	}
 }
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@ -118,12 +118,23 @@ abstract class ###Component###Helper
 	**/
 	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = '###component###')
 	{
-		// load some joomla helpers
-		JLoader::import('joomla.application.component.model');
+		// full path
+		$fullPath = $path . '/models';
 		// load the model file
-		JLoader::import( $name, $path . '/models' );
-		// return instance
-		return JModelLegacy::getInstance( $name, $component.'Model' );
+		JModelLegacy::addIncludePath($fullPath);
+		// get instance
+		$model = JModelLegacy::getInstance( $name, $component.'Model' );
+		// if model not found
+		if ($model == false)
+		{
+			require_once $fullPath.'/'.strtolower($name).'.php';
+			// build class name
+			$class = $prefix.$name;
+			// initialize the model
+			new $class();
+			$model = JModelLegacy::getInstance($name, $prefix);
+		}
+		return $model;
 	}
 	
 	/**
@ -331,7 +342,14 @@ abstract class ###Component###Helper
 			$query = $db->getQuery(true);

 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#_'.$main.'_'.$table));
+			if (empty($table))
+			{
+				$query->from($db->quoteName('#__'.$main));
+			}
+			else
+			{
+				$query->from($db->quoteName('#_'.$main.'_'.$table));
+			}
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@ -644,7 +662,13 @@ abstract class ###Component###Helper
 		return false;
 	}

+	// typo sorry!
 	public static function sorten($string, $length = 40, $addTip = true)
+	{
+		return self::shorten($string, $length, $addTip);
+	}
+
+	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
 		{
@ -667,7 +691,7 @@ abstract class ###Component###Helper
 			$final	= strlen($newString);
 			if ($initial != $final && $addTip)
 			{
-				$title = self::sorten($string, 400 , false);
+				$title = self::shorten($string, 400 , false);
 				return '<span class="hasTip" title="'.$title.'" style="cursor:help">'.trim($newString).'...</span>';
 			}
 			elseif ($initial != $final && !$addTip)
@ -766,15 +790,15 @@ abstract class ###Component###Helper
                return '';
 	}

-	public static function htmlEscape($var, $charset = 'UTF-8', $sorten = false, $length = 40)
+	public static function htmlEscape($var, $charset = 'UTF-8', $shorten = false, $length = 40)
 	{
 		if (self::checkString($var))
 		{
 			$filter = new JFilterInput();
 			$string = $filter->clean(html_entity_decode(htmlentities($var, ENT_COMPAT, $charset)), 'HTML');
-			if ($sorten)
+			if ($shorten)
 			{
-           		return self::sorten($string,$length);
+           		return self::shorten($string,$length);
 			}
 			return $string;
 		}
--- a/admin/compiler/joomla_3/JViewLegacy_list.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list.php
@ -142,7 +142,7 @@ class ###Component###View###Views### extends JViewLegacy
                        {
                                JToolbarHelper::trash('###views###.trash');
                        }###EXPORTBUTTON###
-                }###IMPORTBUTTON###
+                }###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST### ###IMPORTBUTTON###

                // set help url for this view if found
                $help_url = ###Component###Helper::getHelpUrl('###views###');
--- a/admin/compiler/joomla_3/default_vdm.php
+++ b/admin/compiler/joomla_3/default_vdm.php
@ -29,29 +29,27 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-$manifest = ###Component###Helper::manifest();
-
 ?>
-<img alt="<?php echo JText::_('COM_###COMPONENT###'); ?>" src="components/com_###component###/assets/images/component-300.###COMP_IMAGE_TYPE###">
+<img alt="<?php echo JText::_('COM_###COMPONENT###'); ?>" src="components/com_###component###/assets/images/vdm-component.###COMP_IMAGE_TYPE###">
 <ul class="list-striped">
-<li><b><?php echo JText::_('COM_###COMPONENT###_VERSION'); ?>:</b> <?php echo $manifest->version; ?></li>
-<li><b><?php echo JText::_('COM_###COMPONENT###_DATE'); ?>:</b> <?php echo $manifest->creationDate; ?></li>
-<li><b><?php echo JText::_('COM_###COMPONENT###_AUTHOR'); ?>:</b> <a href="mailto:<?php echo $manifest->authorEmail; ?>"><?php echo $manifest->author; ?></a></li>
-<li><b><?php echo JText::_('COM_###COMPONENT###_WEBSITE'); ?>:</b> <a href="<?php echo $manifest->authorUrl; ?>" target="_blank"><?php echo $manifest->authorUrl; ?></a></li>
-<li><b><?php echo JText::_('COM_###COMPONENT###_LICENSE'); ?>:</b> <?php echo $manifest->license; ?></li>
-<li><b><?php echo $manifest->copyright; ?></b></li>
+	<li><b><?php echo JText::_('COM_###COMPONENT###_VERSION'); ?>:</b> <?php echo $this->manifest->version; ?>&nbsp;&nbsp;<span class="update-notice"></span></li>
+	<li><b><?php echo JText::_('COM_###COMPONENT###_DATE'); ?>:</b> <?php echo $this->manifest->creationDate; ?></li>
+	<li><b><?php echo JText::_('COM_###COMPONENT###_AUTHOR'); ?>:</b> <a href="mailto:<?php echo $this->manifest->authorEmail; ?>"><?php echo $this->manifest->author; ?></a></li>
+	<li><b><?php echo JText::_('COM_###COMPONENT###_WEBSITE'); ?>:</b> <a href="<?php echo $this->manifest->authorUrl; ?>" target="_blank"><?php echo $this->manifest->authorUrl; ?></a></li>
+	<li><b><?php echo JText::_('COM_###COMPONENT###_LICENSE'); ?>:</b> <?php echo $this->manifest->license; ?></li>
+	<li><b><?php echo $this->manifest->copyright; ?></b></li>
 </ul>
 <div class="clearfix"></div>
 <?php if(###Component###Helper::checkArray($this->contributors)): ?>
-<?php if(count($this->contributors) > 1): ?>
-<h3><?php echo JText::_('COM_###COMPONENT###_CONTRIBUTORS'); ?></h3>
-<?php else: ?>
-<h3><?php echo JText::_('COM_###COMPONENT###_CONTRIBUTOR'); ?></h3>
-<?php endif; ?>
-<ul class="list-striped">
-	<?php foreach($this->contributors as $contributor): ?>
-    <li><b><?php echo $contributor['title']; ?>:</b> <?php echo $contributor['name']; ?></li>
-    <?php endforeach; ?>
-</ul>
-<div class="clearfix"></div>
+	<?php if(count($this->contributors) > 1): ?>
+		<h3><?php echo JText::_('COM_###COMPONENT###_CONTRIBUTORS'); ?></h3>
+	<?php else: ?>
+		<h3><?php echo JText::_('COM_###COMPONENT###_CONTRIBUTOR'); ?></h3>
+	<?php endif; ?>
+	<ul class="list-striped">
+		<?php foreach($this->contributors as $contributor): ?>
+		<li><b><?php echo $contributor['title']; ?>:</b> <?php echo $contributor['name']; ?></li>
+		<?php endforeach; ?>
+	</ul>
+	<div class="clearfix"></div>
 <?php endif; ?>
--- a/admin/compiler/joomla_3/headercheck.php
+++ b/admin/compiler/joomla_3/headercheck.php
@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-class HeaderCheck
+class ###component###HeaderCheck
 {
 	function js_loaded($script_name)
 	{
--- a/admin/compiler/joomla_3/headercheck_admin.php
+++ b/admin/compiler/joomla_3/headercheck_admin.php
@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-class HeaderCheck
+class ###component###HeaderCheck
 {
 	function js_loaded($script_name)
 	{
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@ -43,7 +43,8 @@ $document->addStyleSheet('components/com_componentbuilder/assets/css/admin.css')
 $document->addScript('components/com_componentbuilder/assets/js/admin.js');

 // require helper files
-JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); 
+JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); 
+JLoader::register('ComponentbuilderEmail', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/componentbuilderemail.php'); 
 JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 

 // Triger the Global Admin Event
--- a/admin/config.xml
+++ b/admin/config.xml
@ -75,7 +75,16 @@
 			step="10"
 		/>		
 		<!-- Spacer_hr_a Field. Type: Spacer. A None Database Field. (joomla) -->
-		<field type="spacer" name="spacer_hr_a" hr="true" class="spacer_hr_a" />
+		<field type="spacer" name="spacer_hr_a" hr="true" class="spacer_hr_a" />		
+		<!-- Api Field. Type: User. (joomla) -->
+		<field
+			type="user"
+			name="api"
+			label="COM_COMPONENTBUILDER_CONFIG_API_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION"
+		/>		
+		<!-- Spacer_hr_b Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_b" hr="true" class="spacer_hr_b" />
 		<field name="autorTitle"
 			type="spacer"
 			label="COM_COMPONENTBUILDER_CONFIG_AUTHOR"
@ -146,6 +155,340 @@
 				COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD</option>"
 		</field>
 	</fieldset>
+
+	<fieldset
+		name="mail_configuration_custom_config"
+		label="COM_COMPONENTBUILDER_CONFIG_MAIL_CONFIGURATION">
+
+		<!-- Mailonline Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="mailonline"
+			label="COM_COMPONENTBUILDER_CONFIG_MAILONLINE_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_MAILONLINE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_ON</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CONFIG_OFF</option>
+		</field>		
+		<!-- Mailer Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="mailer"
+			label="COM_COMPONENTBUILDER_CONFIG_MAILER_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_MAILER_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			filter="WORD"
+			required="true"
+			default="global">
+			<!-- Option Set. -->
+			<option value="global">
+				COM_COMPONENTBUILDER_CONFIG_GLOBAL</option>
+			<option value="default">
+				COM_COMPONENTBUILDER_CONFIG_PHP_MAIL</option>
+			<option value="sendmail">
+				COM_COMPONENTBUILDER_CONFIG_SENDMAIL</option>
+			<option value="smtp">
+				COM_COMPONENTBUILDER_CONFIG_SMTP</option>
+		</field>		
+		<!-- Emailfrom Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="emailfrom"
+			label="COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			validate="email"
+			message="Error! Please add email address here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT"
+			showon="mailer:smtp,sendmail,default"
+		/>		
+		<!-- Fromname Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="fromname"
+			label="COM_COMPONENTBUILDER_CONFIG_FROMNAME_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_FROMNAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add some name here."
+			hint="COM_COMPONENTBUILDER_CONFIG_FROMNAME_HINT"
+			showon="mailer:smtp,sendmail,default"
+		/>		
+		<!-- Email reply to Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="replyto"
+			label="COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			validate="email"
+			message="Error! Please add email address here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_HINT"
+			showon="mailer:smtp,sendmail,default"
+		/>		
+		<!-- Reply to name Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="replytoname"
+			label="COM_COMPONENTBUILDER_CONFIG_REPLYNAME_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_REPLYNAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add some name here."
+			hint="COM_COMPONENTBUILDER_CONFIG_REPLYNAME_HINT"
+			showon="mailer:smtp,sendmail,default"
+		/>		
+		<!-- Sendmail Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="sendmail"
+			label="COM_COMPONENTBUILDER_CONFIG_SENDMAIL_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_SENDMAIL_DESCRIPTION"
+			class="text_area"
+			required="false"
+			filter="PATH"
+			message="Error! Please add path to you local sendmail here."
+			hint="COM_COMPONENTBUILDER_CONFIG_SENDMAIL_HINT"
+			showon="mailer:sendmail"
+		/>		
+		<!-- Smtpauth Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="smtpauth"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="mailer:smtp">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CONFIG_NO</option>
+		</field>		
+		<!-- Smtpsecure Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="smtpsecure"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPSECURE_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPSECURE_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			filter="WORD"
+			default="none"
+			showon="mailer:smtp">
+			<!-- Option Set. -->
+			<option value="none">
+				COM_COMPONENTBUILDER_CONFIG_NONE</option>
+			<option value="ssl">
+				COM_COMPONENTBUILDER_CONFIG_SSL</option>
+			<option value="tls">
+				COM_COMPONENTBUILDER_CONFIG_TLS</option>
+		</field>		
+		<!-- Smtpport Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="smtpport"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPPORT_LABEL"
+			size="60"
+			maxlength="150"
+			default="25"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPPORT_DESCRIPTION"
+			class="text_area"
+			filter="INT"
+			message="Error! Please add the port number of your SMTP server here."
+			hint="COM_COMPONENTBUILDER_CONFIG_SMTPPORT_HINT"
+			showon="mailer:smtp"
+		/>		
+		<!-- Smtpuser Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="smtpuser"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPUSER_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPUSER_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add the username for SMTP server here."
+			hint="COM_COMPONENTBUILDER_CONFIG_SMTPUSER_HINT"
+			showon="mailer:smtp"
+		/>		
+		<!-- Smtppass Field. Type: Password. (joomla) -->
+		<field
+			type="password"
+			name="smtppass"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPPASS_LABEL"
+			size="60"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPPASS_DESCRIPTION"
+			class="text_area"
+			filter="raw"
+			message="Error! Please add the password for SMTP server here."
+			showon="mailer:smtp"
+		/>		
+		<!-- Smtphost Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="smtphost"
+			label="COM_COMPONENTBUILDER_CONFIG_SMTPHOST_LABEL"
+			size="60"
+			maxlength="150"
+			default="localhost"
+			description="COM_COMPONENTBUILDER_CONFIG_SMTPHOST_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add the name of the SMTP host here."
+			hint="COM_COMPONENTBUILDER_CONFIG_SMTPHOST_HINT"
+			showon="mailer:smtp"
+		/>
+	</fieldset>
+	<fieldset
+		name="dkim_custom_config"
+		label="COM_COMPONENTBUILDER_CONFIG_DKIM">
+
+		<!-- Dkim Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="dkim"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CONFIG_NO</option>
+		</field>		
+		<!-- Dkim_domain Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="dkim_domain"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add DKIM Domain here."
+			hint="COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_HINT"
+			showon="dkim:1"
+			onchange="vdm_dkim();"
+		/>		
+		<!-- Dkim_selector Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="dkim_selector"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_LABEL"
+			size="60"
+			maxlength="150"
+			default="vdm"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add DKIM/DNS selector here."
+			hint="COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_HINT"
+			showon="dkim:1"
+			onchange="vdm_dkim();"
+		/>		
+		<!-- Dkim_passphrase Field. Type: Password. (joomla) -->
+		<field
+			type="password"
+			name="dkim_passphrase"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_PASSPHRASE_LABEL"
+			size="60"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_PASSPHRASE_DESCRIPTION"
+			class="text_area"
+			filter="raw"
+			message="Error! Please add  passphrase here."
+			showon="dkim:1"
+		/>		
+		<!-- Dkim_identity Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="dkim_identity"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_DESCRIPTION"
+			class="text_area"
+			filter="raw"
+			message="Error! Please add  DKIM Identity here."
+			hint="COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_HINT"
+			showon="dkim:1"
+		/>		
+		<!-- Dkim_private_key Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="dkim_private_key"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_PRIVATE_KEY_LABEL"
+			rows="15"
+			cols="5"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_PRIVATE_KEY_DESCRIPTION"
+			class="input-xxlarge span12"
+			showon="dkim:1"
+		/>		
+		<!-- Dkim_public_key Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="dkim_public_key"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_PUBLIC_KEY_LABEL"
+			rows="5"
+			cols="5"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_PUBLIC_KEY_DESCRIPTION"
+			class="input-xxlarge span12"
+			showon="dkim:1"
+			onchange="vdm_dkim();"
+		/>		
+		<!-- Note_dkim_use Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_dkim_use" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DKIM_USE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DKIM_USE_DESCRIPTION" heading="h4" class="note_dkim_use" showon="dkim:1" />		
+		<!-- Dkim_key Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="dkim_key"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add KEY here."
+			hint="COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_HINT"
+			showon="dkim:1"
+		/>		
+		<!-- Dkim_value Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="dkim_value"
+			label="COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL"
+			size="80"
+			maxlength="350"
+			description="COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="Error! Please add TXT record here."
+			hint="COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT"
+			showon="dkim:1"
+		/>
+	</fieldset>
 	<fieldset
 		name="encryption_config"
 		label="COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL"
@ -159,6 +502,62 @@
 			default=""
 		/>
 	</fieldset>
+	<fieldset
+		name="cronjob_custom_config"
+		label="COM_COMPONENTBUILDER_CONFIG_CRONJOB">
+
+		<!-- Backupcronjob_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="backupcronjob_note" label="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION" heading="h4" class="backupcronjob_note" />		
+		<!-- Cronjob_backup_folder_path Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="cronjob_backup_folder_path"
+			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL"
+			size="70"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="false"
+			filter="PATH"
+			message="Error! Please add some text here."
+			hint="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT"
+		/>		
+		<!-- Backup_email Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="backup_email"
+			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL"
+			size="10"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			validate="email"
+			message="Error! Please add email address here."
+			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT"
+		/>		
+		<!-- Package_name_plaeholders Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="package_name_plaeholders" label="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL" description="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION" heading="h4" class="package_name_plaeholders" />		
+		<!-- Backup_package_name Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="backup_package_name"
+			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL"
+			size="40"
+			maxlength="150"
+			default="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
+			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="STRING"
+			message="Error! Please add name here."
+			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT"
+		/>
+	</fieldset>
 	<fieldset
 		name="folder_paths_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS">
--- a/admin/controller.php
+++ b/admin/controller.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 111 of this MVC
-	@build			7th May, 2017
+	@build			17th July, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 111 of this MVC
-	@build			7th May, 2017
+	@build			17th July, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@ -45,6 +45,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('isNew', 'ajax');
 		$this->registerTask('isRead', 'ajax');
 		$this->registerTask('getComponentDetails', 'ajax');
+		$this->registerTask('getCronPath', 'ajax');
 		$this->registerTask('tableColumns', 'ajax');
 		$this->registerTask('fieldSelectOptions', 'ajax');
 		$this->registerTask('getImportScripts', 'ajax');
@ -188,6 +189,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'getCronPath':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$getTypeValue = $jinput->get('getType', NULL, 'WORD');
+						if($getTypeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getCronPath($getTypeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'tableColumns':
 					try
 					{
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 49 of this MVC
-	@build			31st May, 2017
+	@version		@update number 53 of this MVC
+	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 22 of this MVC
-	@build			1st March, 2017
+	@build			17th July, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 22 of this MVC
-	@build			1st March, 2017
+	@build			17th July, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 338 of this MVC
-	@build			16th June, 2017
+	@version		@update number 355 of this MVC
+	@build			21st August, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 338 of this MVC
-	@build			16th June, 2017
+	@version		@update number 355 of this MVC
+	@build			21st August, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php
@ -114,8 +114,8 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		// Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
-		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		$model->user = JFactory::getUser();
+		if ($model->user->authorise('joomla_component.import', 'com_componentbuilder') && $model->user->authorise('core.import', 'com_componentbuilder'))
 		{
 			$session = JFactory::getSession();
 			$session->set('backto_VDM_IMPORT', 'joomla_components');
@ -135,9 +135,11 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 	{
 		// Check for request forgeries
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// Get the model
+		$model = $this->getModel('Joomla_components');
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
-		if ($user->authorise('joomla_component.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
+		$model->user = JFactory::getUser();
+		if ($model->user->authorise('joomla_component.export', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
 		{
 			// Get the input
 			$input = JFactory::getApplication()->input;
@ -152,8 +154,6 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
 				return;
 			}
-			// Get the model
-			$model = $this->getModel('Joomla_components');
 			// set auto loader
 			ComponentbuilderHelper::autoLoader('smart');
 			// get the data to export
@ -239,4 +239,154 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
 		return;
 	}
+			
+        public function backup()
+	{
+		// get params
+		if (!isset($this->params) || !ComponentbuilderHelper::checkObject($this->params))
+		{
+			$this->params = JComponentHelper::getParams('com_componentbuilder');
+		}
+		// get all component IDs to backup
+		$pks = componentbuilderHelper::getComponentIDs();
+		// Get the model
+		$model = componentbuilderHelper::getModel('joomla_components', JPATH_ADMINISTRATOR . '/components/com_componentbuilder');
+		// set user
+		$model->user = $this->getApiUser();
+		// make sure to set active type to backup
+		$model->activeType = 'manualBackup';
+		// set auto loader
+		ComponentbuilderHelper::autoLoader('smart');
+		// manual backup message
+		$backupNotice = array();
+		// get the data to export
+		if (ComponentbuilderHelper::checkArray($pks) && $model->getSmartExport($pks))
+		{
+			$backupNotice[] = JText::_('COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY');
+			$backupNoticeStatus = 'Success';
+			// set the key string
+			if (componentbuilderHelper::checkString($model->key) && strlen($model->key) == 32)
+			{
+				$textNotice = array();
+				$keyNotice = '<h1>' . JText::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE', $model->key) . '</h1>';
+				$textNotice[] = JText::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_S', $model->key);
+				$keyNotice .= JText::_('COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY_UNLESS_THEY_HAVE_THIS_KEY_ABOVE_SO_DO_KEEP_IT_SAFE') . '<br />';
+				// set the package owner info
+				if ((isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company'])) || (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner'])))
+				{
+					$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '</h2>';
+					$textNotice[] = '# ' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS');
+					$ownerDetails .= '<ul>';
+					if (isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $model->info['getKeyFrom']['company']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_COMPANY_S', $model->info['getKeyFrom']['company']);
+					}
+					// add value only if set
+					if (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $model->info['getKeyFrom']['owner']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_OWNER_S', $model->info['getKeyFrom']['owner']);
+					}
+					// add value only if set
+					if (isset($model->info['getKeyFrom']['website']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['website']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $model->info['getKeyFrom']['website']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_WEBSITE_S', $model->info['getKeyFrom']['website']);
+					}
+					// add value only if set
+					if (isset($model->info['getKeyFrom']['email']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['email']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $model->info['getKeyFrom']['email']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_EMAIL_S', $model->info['getKeyFrom']['email']);
+					}
+					// add value only if set
+					if (isset($model->info['getKeyFrom']['license']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['license']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $model->info['getKeyFrom']['license']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_LICENSE_S', $model->info['getKeyFrom']['license']);
+					}
+					// add value only if set
+					if (isset($model->info['getKeyFrom']['copyright']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['copyright']))
+					{
+						$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $model->info['getKeyFrom']['copyright']) . '</li>';
+						$textNotice[] = '- ' . JText::sprintf('COM_COMPONENTBUILDER_COPYRIGHT_S', $model->info['getKeyFrom']['copyright']);
+					}							
+					$ownerDetails .= '</ul>';
+					$backupNotice[] = JText::_('COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET');
+				}
+				else
+				{
+					$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET') . '</h2>';
+					$textNotice[] = '# ' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS');
+					$ownerDetails .= JText::_('COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE') . '<br />';
+					$textNotice[] = JText::_('COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE');
+					$ownerDetails .= '<h3>' . JText::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS') . '</h3>';
+					$textNotice[] = '## ' .  JText::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS');
+					$ownerDetails .= JText::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB') . '<br />';
+					$textNotice[] = JText::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT');
+					$backupNotice[] = JText::_('COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE');
+				}
+			}
+			else
+			{
+				$keyNotice = '<h1>' . JText::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY') . '</h1>';
+				$textNotice[] = '# ' . JText::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY');
+				$ownerDetails = JText::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB') . '<br />';
+				$textNotice[] = JText::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY');
+				$backupNotice[] = JText::_('COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY');
+			}
+			// get email
+			if ($email = $this->params->get('backup_email', null))
+			{
+				// plain text
+				$plainText = implode("\n", $textNotice);
+				// set hash to track changes
+				$hashTracker = md5($plainText);
+				if (ComponentbuilderHelper::newHash($hashTracker))
+				{
+					// Build final massage.
+					$message = $keyNotice . $ownerDetails . '<br /><small>HASH: ' . $hashTracker . '</small>';
+					// set the subject
+					$subject = JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY');
+					// email the message
+					componentbuilderEmail::send($email, $subject, componentbuilderEmail::setTableBody($message, $subject), $plainText, 1);
+					$backupNotice[] = JText::_('COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SEND');
+				}
+				else
+				{
+					$backupNotice[] = JText::_('COM_COMPONENTBUILDER_KEY_HAS_NOT_CHANGED');
+				}
+			}
+		}
+		else
+		{
+			$backupNotice[] = JText::_('COM_COMPONENTBUILDER_BACKUP_FAILED_PLEASE_TRY_AGAIN_IF_THE_ERROR_CONTINUE_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR');
+			$backupNoticeStatus = 'Error';
+			if (componentbuilderHelper::checkString($model->packagePath))
+			{
+				// clear all if not successful
+				ComponentbuilderHelper::removeFolder($model->packagePath);
+			}
+			if (componentbuilderHelper::checkString($model->zipPath))
+			{
+				// clear all if not successful
+				JFile::delete($model->zipPath);
+			}				
+		}
+		// quite only if auto backup (adding this script from custom code :)
+		if ('backup' === 'manualBackup')
+		{
+			echo "# " . $backupNoticeStatus . "\n" .implode("\n", $backupNotice);
+			jexit();
+		}
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), implode("<br />", $backupNotice), $backupNoticeStatus);
+		return;
+	}			
+
+	protected function getApiUser()
+	{
+		// admin area does not have API user, only front-end (so we fallback on login user)
+		return JFactory::getUser();
+	}
 }
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 51 of this MVC
-	@build			6th March, 2017
+	@build			17th July, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
--- a/admin/controllers/site_views.php
+++ b/admin/controllers/site_views.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 51 of this MVC
-	@build			6th March, 2017
+	@build			17th July, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
--- a/admin/custom/timeago.js
+++ b/admin/custom/timeago.js
@ -0,0 +1,232 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 1.5.4
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2017, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof module === 'object' && typeof module.exports === 'object') {
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function ($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowPast: true,
+      allowFuture: false,
+      localeTitle: false,
+      cutoff: 0,
+      autoDispose: true,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        inPast: 'any moment now',
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+
+    inWords: function(distanceMillis) {
+      if (!this.settings.allowPast && ! this.settings.allowFuture) {
+          throw 'timeago allowPast and allowFuture settings can not both be set to false.';
+      }
+
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      if (!this.settings.allowPast && distanceMillis >= 0) {
+        return this.settings.strings.inPast;
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator || "";
+      if ($l.wordSeparator === undefined) { separator = " "; }
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  // functions that can be called via $(el).timeago('action')
+  // init is default when no action is given
+  // functions are called with context of a single element
+  var functions = {
+    init: function() {
+      functions.dispose.call(this);
+      var refresh_el = $.proxy(refresh, this);
+      refresh_el();
+      var $s = $t.settings;
+      if ($s.refreshMillis > 0) {
+        this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
+      }
+    },
+    update: function(timestamp) {
+      var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
+      $(this).data('timeago', { datetime: date });
+      if ($t.settings.localeTitle) {
+        $(this).attr("title", date.toLocaleString());
+      }
+      refresh.apply(this);
+    },
+    updateFromDOM: function() {
+      $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
+      refresh.apply(this);
+    },
+    dispose: function () {
+      if (this._timeagoInterval) {
+        window.clearInterval(this._timeagoInterval);
+        this._timeagoInterval = null;
+      }
+    }
+  };
+
+  $.fn.timeago = function(action, options) {
+    var fn = action ? functions[action] : functions.init;
+    if (!fn) {
+      throw new Error("Unknown function name '"+ action +"' for timeago");
+    }
+    // each over objects here and call the requested function
+    this.each(function() {
+      fn.call(this, options);
+    });
+    return this;
+  };
+
+  function refresh() {
+    var $s = $t.settings;
+
+    //check if it's still visible
+    if ($s.autoDispose && !$.contains(document.documentElement,this)) {
+      //stop if it has been removed
+      $(this).timeago("dispose");
+      return this;
+    }
+
+    var data = prepareData(this);
+
+    if (!isNaN(data.datetime)) {
+      if ( $s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
+        $(this).text(inWords(data.datetime));
+      } else {
+        if ($(this).attr('title').length > 0) {
+            $(this).text($(this).attr('title'));
+        }
+      }
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if ($t.settings.localeTitle) {
+        element.attr("title", element.data('timeago').datetime.toLocaleString());
+      } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}));
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@ -61,6 +61,13 @@ class Fields extends Structure
 	 */
 	public $layoutBuilder = array();
 	
+	/**
+	 * used to fix the zero order
+	 * 
+	 * @var    array
+	 */
+	private $zeroOrderFix = array();
+	
 	/**
 	 * Site field data
 	 * 
@ -470,7 +477,6 @@ class Fields extends Structure
 			{
 				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $this->placeholders, $dbkey, true);
 			}
-			
 			// set the defautl fields
 			$fieldSet = array();
 			$fieldSet[] = '<fieldset name="details">';
@ -1161,6 +1167,26 @@ class Fields extends Structure
 	 */
 	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
 	{
+		// first fix the zero order
+		// to insure it lands before all the other fields
+		// as zero is expected to behave
+		if ($field['order_edit'] == 0)
+		{
+			if (!isset($this->zeroOrderFix[$viewName]))
+			{
+				$this->zeroOrderFix[$viewName] = array();
+			}
+			if (!isset($this->zeroOrderFix[$viewName][(int) $field['tab']]))
+			{
+				$this->zeroOrderFix[$viewName][(int) $field['tab']] = -999;
+			}
+			else
+			{
+				$this->zeroOrderFix[$viewName][(int) $field['tab']]++;
+			}
+			$field['order_edit'] = $this->zeroOrderFix[$viewName][(int) $field['tab']];
+		}
+		// now build the layout
 		if (ComponentbuilderHelper::checkString($tabName) && $tabName != 'publishing')
 		{
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
@ -1583,6 +1609,12 @@ class Fields extends Structure
 				{
 					$this->doNotEscape[$listViewName][] = $fieldAttributes['name'];
 				}
+				// check if we have display switch for dynamic placment
+				$display = ComponentbuilderHelper::getBetween($field['settings']->xml, 'display="', '"');
+				if (ComponentbuilderHelper::checkString($display))
+				{
+					$fieldAttributes['display'] = $display;
+				}
 			}
 		}
 		return $fieldAttributes;
@ -1759,13 +1791,13 @@ class Fields extends Structure
                                $this->queryBuilder[$viewName][$name]['lenght_other']   = $field['settings']->datalenght_other;
                                $this->queryBuilder[$viewName][$name]['default']        = $field['settings']->datadefault;
                                $this->queryBuilder[$viewName][$name]['other']          = $field['settings']->datadefault_other;
-				// to identify the field
-                                $this->queryBuilder[$viewName][$name]['ID']		= $field['settings']->id;
                        }
                        else
                        {
                                $this->queryBuilder[$viewName][$name]['default']        = 'EMPTY';
                        }
+			// to identify the field
+			$this->queryBuilder[$viewName][$name]['ID']		= $field['settings']->id;
                        $this->queryBuilder[$viewName][$name]['null_switch']    = $field['settings']->null_switch;
 			// set index types
 			if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $textKeys))
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -92,6 +92,7 @@ class Interpretation extends Fields
 		{
 			// set email helper in place with component name
 			$component = $this->fileContentStatic['###component###'];
+			$Component = $this->fileContentStatic['###Component###'];
 			$target = array('admin' => 'emailer');
 			$done = $this->buildDynamique($target,'emailer',$component);
 			if ($done)
@ -99,7 +100,7 @@ class Interpretation extends Fields
 				// the text for the file ###BAKING###
 				$this->fileContentDynamic['emailer_'.$component]['###BAKING###'] = ''; // <<-- to insure it gets updated
 				// return the code need to load the abstract class
-				return PHP_EOL."JLoader::register('".$component."Email', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/".$component."email.php'); ";
+				return PHP_EOL."JLoader::register('".$Component."Email', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/".$component."email.php'); ";
 			}
 		}
 		return '';
@ -583,9 +584,14 @@ class Interpretation extends Fields
 			$updateServer[] = "\t</updateservers>";
 			// return the array to string
 			$updateServer = implode(PHP_EOL, $updateServer);
+			// add update server details to component XML file
+			$this->fileContentStatic['###UPDATESERVER###'] = $updateServer;
+		}
+		else
+		{
+			// add update server details to component XML file
+			$this->fileContentStatic['###UPDATESERVER###'] = '';
 		}
-		// add update server details to component XML file
-		$this->fileContentStatic['###UPDATESERVER###'] = $updateServer;
 		// ensure to update Component version data
 		if (ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
 		{
@ -1243,24 +1249,30 @@ class Interpretation extends Fields
 		$menuSetter = $view.'_menu';
 		foreach ($params as $field)
 		{
-			// we load fields that have options
-			if (strpos($field,'Option Set. -->') !== false && strpos($field,$menuSetter) === false)
+			// some switch to see if it should be added to front end params
+			$target = ComponentbuilderHelper::getBetween($field, 'display="', '"');
+			if (!ComponentbuilderHelper::checkString($target) || $target === 'menu')
 			{
-				// we add the global option
-				$field = str_replace('Option Set. -->', $this->setLine(__LINE__).' Global & Option Set. -->'.PHP_EOL."\t\t\t".'<option value="">'.PHP_EOL."\t\t\t\t".'JGLOBAL_USE_GLOBAL</option>', $field);
-				// update the default to be global
-				$field = preg_replace('/default=".+"/', 'default=""', $field);
-				// update the default to be filter
-				$field = preg_replace('/filter=".+"/', 'filter="string"', $field);
-				// update required
-				$field = str_replace('required="true"', 'required="false"', $field);
-				// add to keeper array
-				$keep[] = $field;
-			}
-			else
-			{
-				// TODO add convetion to filter fields that we should not load
-				$keep[] = $field;
+				
+				$field = str_replace('display="menu"', '', $field);
+				// we load fields that have options
+				if (strpos($field,'Option Set. -->') !== false && strpos($field,$menuSetter) === false && !ComponentbuilderHelper::checkString($target))
+				{
+					// we add the global option
+					$field = str_replace('Option Set. -->', $this->setLine(__LINE__).' Global & Option Set. -->'.PHP_EOL."\t\t\t".'<option value="">'.PHP_EOL."\t\t\t\t".'JGLOBAL_USE_GLOBAL</option>', $field);
+					// update the default to be global
+					$field = preg_replace('/default=".+"/', 'default=""', $field);
+					// update the default to be filter
+					$field = preg_replace('/filter=".+"/', 'filter="string"', $field);
+					// update required
+					$field = str_replace('required="true"', 'required="false"', $field);
+					// add to keeper array
+					$keep[] = $field;
+				}
+				else
+				{
+					$keep[] = $field;
+				}
 			}
 		}
 		return $keep;
@ -1761,7 +1773,7 @@ class Interpretation extends Fields
 					{
 						$string = "if (isset(" . $whe['value_key']. ") && ".$this->fileContentStatic['###Component###']."Helper::checkArray(" . $whe['value_key']. "))";
 						$string .= PHP_EOL."\t".$tabe."\t{";
-						$string .= PHP_EOL."\t".$tabe."\t\t\//".$this->setLine(__LINE__)." Get where ".$whe['table_key']." is " . $whe['value_key'];
+						$string .= PHP_EOL."\t".$tabe."\t\t//".$this->setLine(__LINE__)." Get where ".$whe['table_key']." is " . $whe['value_key'];
 						$string .= PHP_EOL."\t".$tabe."\t\t\$query->where('".$whe['table_key']." ".$whe['operator'].$value;
 						$string .= PHP_EOL."\t".$tabe."\t}";
 						$string .= PHP_EOL."\t".$tabe."\telse";
@ -1858,7 +1870,7 @@ class Interpretation extends Fields
 					break;
 			}
 			// check that the default and the redirect page is not the same
-			if ($this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $view['settings']->code)
+			if (isset($this->fileContentStatic['###SITE_DEFAULT_VIEW###']) && $this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $view['settings']->code)
 			{
 				$redirectMessage = "\t\t\t//".$this->setLine(__LINE__)." redirect away to the default view if no access allowed.";
 				$redirectString = "JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."')";
@ -1926,17 +1938,17 @@ class Interpretation extends Fields
 			if ($type === 'main')
 			{
 				$getItem .= PHP_EOL."\t".$tab."\t\t\$app = JFactory::getApplication();";
-				$langKeyWord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not found or access denied','U');
-				if (!isset($this->langContent[$this->lang][$langKeyWord]))
+				$langKeyWoord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not found or access denied','U');
+				if (!isset($this->langContent[$this->lang][$langKeyWoord]))
 				{
-					$this->langContent[$this->lang][$langKeyWord] = 'Not found, or access denied.';
+					$this->langContent[$this->lang][$langKeyWoord] = 'Not found, or access denied.';
 				}
 				$getItem .= PHP_EOL."\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning.";
-				$getItem .= PHP_EOL."\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');";
+				$getItem .= PHP_EOL."\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWoord."'), 'warning');";
 				if ('site' === $this->target)
 				{
 					// check that the default and the redirect page is not the same
-					if ($this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $code)
+					if (isset($this->fileContentStatic['###SITE_DEFAULT_VIEW###']) && $this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $code)
 					{
 						$redirectString = "JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."')";
 					}
@ -2933,12 +2945,13 @@ class Interpretation extends Fields
 		if (isset($view['settings']->add_custom_button) && $view['settings']->add_custom_button == 1)
 		{
 			$buttons = array();
+			$this->onlyFunctionButton = array();
 			$functionNames = array();
 			if (isset($view['settings']->custom_buttons) && ComponentbuilderHelper::checkArray($view['settings']->custom_buttons))
 			{
 				foreach ($view['settings']->custom_buttons as $custom_button)
 				{
-					if ($custom_button['target'] != 2 || $this->target === 'site')
+					if (3 !== $type && ($custom_button['target'] != 2 || $this->target === 'site'))
 					{
 						// Load to lang
 						$keyLang = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($custom_button['name'],'U');
@ -2959,18 +2972,29 @@ class Interpretation extends Fields
 						$buttons[] = "\t".$tab."\t}";
 					}
 					// load the list button
-					elseif (3 == $type && ($custom_button['target'] == 2 || $custom_button['target'] == 3))
+					elseif (3 == $type && $custom_button['target'] != 1)
 					{
 						// Load to lang
 						$keyLang = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($custom_button['name'],'U');
                                                $keyCode = ComponentbuilderHelper::safeString($custom_button['name']);
 						$this->langContent[$this->lang][$keyLang] = trim($custom_button['name']);
 						// add cpanel button TODO does not work well on site with permissions
-						$buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))";
-						$buttons[] = "\t".$tab."\t{";
-						$buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button.";
-						$buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);";
-						$buttons[] = "\t".$tab."\t}";
+						if (isset($custom_button['type']) && $custom_button['type'] == 2)
+						{
+							$this->onlyFunctionButton[] = "\t".$tab."if (\$this->user->authorise('".$viewName.".".$keyCode."'))";
+							$this->onlyFunctionButton[] = "\t".$tab."{";
+							$this->onlyFunctionButton[] = "\t".$tab."\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button.";
+							$this->onlyFunctionButton[] = "\t".$tab."\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);";
+							$this->onlyFunctionButton[] = "\t".$tab."}";
+						}
+						else
+						{
+							$buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))";
+							$buttons[] = "\t".$tab."\t{";
+							$buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button.";
+							$buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);";
+							$buttons[] = "\t".$tab."\t}";
+						}
 					}
 				}
 			}
@ -3026,6 +3050,16 @@ class Interpretation extends Fields
 		return '';
 	}

+	public function setFunctionOnlyButtons()
+	{
+		// return buttons if they were build
+		if (isset($this->onlyFunctionButton) && ComponentbuilderHelper::checkArray($this->onlyFunctionButton))
+		{
+			return PHP_EOL.implode(PHP_EOL,$this->onlyFunctionButton);
+		}
+		return '';
+	}
+
 	public function setCustomCSS(&$view)
 	{
 		if ($view['settings']->add_css == 1)
@ -3226,7 +3260,7 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL."\t\trequire_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );";
 		}
 		$setter .= PHP_EOL."\t\t//".$this->setLine(__LINE__)." Initialize the header checker.";
-		$setter .= PHP_EOL."\t\t\$HeaderCheck = new HeaderCheck;";
+		$setter .= PHP_EOL."\t\t\$HeaderCheck = new ".$this->fileContentStatic['###component###']."HeaderCheck;";
 		// load the defaults needed
 		if ($this->uikit)
 		{
@ -3913,7 +3947,7 @@ class Interpretation extends Fields
 		if (ComponentbuilderHelper::checkString($script))
 		{
 			$script .= PHP_EOL."\t\t\t".'echo \'<a target="_blank" href="'.$this->fileContentStatic['###AUTHORWEBSITE###'].'" title="'.$this->fileContentStatic['###Component_name###'].'">';
-			$script .= PHP_EOL."\t\t\t\t".'<img src="components/com_'.$component.'/assets/images/component-300.'.$this->componentImageType.'"/>';
+			$script .= PHP_EOL."\t\t\t\t".'<img src="components/com_'.$component.'/assets/images/vdm-component.'.$this->componentImageType.'"/>';
 			$script .= PHP_EOL."\t\t\t\t".'</a>\';';
 			
 			return $script;
@ -3930,7 +3964,7 @@ class Interpretation extends Fields
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			$script .= PHP_EOL."\t\t\t".'echo \'<a target="_blank" href="'.$this->fileContentStatic['###AUTHORWEBSITE###'].'" title="'.$this->fileContentStatic['###Component_name###'].'">';
-			$script .= PHP_EOL."\t\t\t\t".'<img src="components/com_'.$this->fileContentStatic['###component###'].'/assets/images/component-300.'.$this->componentImageType.'"/>';
+			$script .= PHP_EOL."\t\t\t\t".'<img src="components/com_'.$this->fileContentStatic['###component###'].'/assets/images/vdm-component.'.$this->componentImageType.'"/>';
 			$script .= PHP_EOL."\t\t\t\t".'</a>';
 			$script .= PHP_EOL."\t\t\t\t<h3>Upgrade to Version ".$this->fileContentStatic['###VERSION###']." Was Successful! Let us know if anything is not working as expected.</h3>';";
 		}
@ -7237,7 +7271,7 @@ class Interpretation extends Fields
 	/**
 	 * @param $viewName_list
 	 * @return array|string
-     */
+	 */
 	public function setCustomAdminDynamicButton($viewName_list)
 	{
 		$buttons = '';
@ -7267,7 +7301,7 @@ class Interpretation extends Fields
 	/**
 	 * @param $viewName_list
 	 * @return array|string
-     */
+	 */
 	public function setCustomAdminDynamicButtonController($viewName_list)
 	{
 		$method = '';
@ -7317,7 +7351,7 @@ class Interpretation extends Fields
 	 * @param $viewName_single
 	 * @param $viewName_list
 	 * @return string
-     */
+	 */
 	public function setModelExportMethod($viewName_single, $viewName_list)
 	{
 		$query = '';
@ -8421,7 +8455,7 @@ class Interpretation extends Fields
 						// target a class if this is a note or spacer
 						$targetType = ".";
 					}
-					elseif ($target['type'] === 'editor')
+					elseif ($target['type'] === 'editor' || $target['type'] === 'subform')
 					{
 						// target the label if  editor field
 						$targetType = "#jform_";
@ -11199,7 +11233,7 @@ class Interpretation extends Fields
 		{
 			$imagePath = $this->componentPath.'/admin/assets/images';
 			// move the image to its place
-			JFile::copy(JPATH_SITE.'/'.$path, $imagePath.'/component-300.'.$type,'',true);
+			JFile::copy(JPATH_SITE.'/'.$path, $imagePath.'/vdm-component.'.$type,'',true);
 			// now set the type to global for re-use
 			$this->componentImageType = $type;
 			// return image type
@ -12009,8 +12043,17 @@ class Interpretation extends Fields
 						$fieldDefault = ComponentbuilderHelper::getBetween($xmlField,'default="','"');
 						if (isset($field['custom_value']) && ComponentbuilderHelper::checkString($field['custom_value']))
 						{
-							// load the Global checkin defautls
-							$this->paramsBuilder .= ',"'.$fieldName.'":"'.$field['custom_value'].'"';
+							// add array if found
+							if ((strpos($field['custom_value'], '["') !== false) && (strpos($field['custom_value'], '"]') !== false))
+							{
+								// load the Global checkin defautls
+								$this->paramsBuilder .= ',"'.$fieldName.'":'.$field['custom_value'];
+							}
+							else
+							{
+								// load the Global checkin defautls
+								$this->paramsBuilder .= ',"'.$fieldName.'":"'.$field['custom_value'].'"';
+							}
 						}
 						elseif (ComponentbuilderHelper::checkString($fieldDefault))
 						{
@ -12169,8 +12212,19 @@ class Interpretation extends Fields
 				$this->configFieldSets[] = "\t<fieldset";
 				$this->configFieldSets[] = "\t\t".'name="'.$tabCode.'"';
 				$this->configFieldSets[] = "\t\t".'label="'.$lang.'_'.$tabUpper.'">';
+				// remove display targeted fields
+				$bucket = array();
+				foreach ($tabFields as $tabField)
+				{
+					$display = ComponentbuilderHelper::getBetween($tabField, 'display="', '"');
+					if (!ComponentbuilderHelper::checkString($display) || $display === 'config')
+					{
+						// remove this display since it is not used in Joomla
+						$bucket[] = str_replace('display="config"', '', $tabField);
+					}
+				}
 				// set the fields
-				$this->configFieldSets[] = implode("\t\t",$tabFields);
+				$this->configFieldSets[] = implode("\t\t",$bucket);
 				// close field set
 				$this->configFieldSets[] = "\t</fieldset>";
 				// remove after loading
@ -12687,10 +12741,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 				$this->langContent[$this->lang][$lang.'_FROMNAME_LABEL'] = "From Name";
 				$this->langContent[$this->lang][$lang.'_FROMNAME_DESCRIPTION'] = "Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name.";
 				$this->langContent[$this->lang][$lang.'_FROMNAME_HINT'] = "From Name Here";
-				$this->langContent[$this->lang][$lang.'_EMAILREPLY_LABEL'] = " Reply Email";
+				$this->langContent[$this->lang][$lang.'_EMAILREPLY_LABEL'] = " Reply to Email";
 				$this->langContent[$this->lang][$lang.'_EMAILREPLY_DESCRIPTION'] = "The global email address that will be used to set as the reply email. (leave blank for none)";
 				$this->langContent[$this->lang][$lang.'_EMAILREPLY_HINT'] = "Email Address Here";
-				$this->langContent[$this->lang][$lang.'_REPLYNAME_LABEL'] = "Reply Name";
+				$this->langContent[$this->lang][$lang.'_REPLYNAME_LABEL'] = "Reply to Name";
 				$this->langContent[$this->lang][$lang.'_REPLYNAME_DESCRIPTION'] = "Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)";
 				$this->langContent[$this->lang][$lang.'_REPLYNAME_HINT'] = "Reply Name Here";
 				$this->langContent[$this->lang][$lang.'_SENDMAIL_LABEL'] = "Sendmail Path";
@ -12782,10 +12836,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 				$this->configFieldSets[] = "\t\t\thint=\"".$lang."_FROMNAME_HINT\"";
 				$this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\"";
 				$this->configFieldSets[] = "\t\t/>\t\t";
-				$this->configFieldSets[] = "\t\t<!--".$this->setLine(__LINE__)." Emailreply Field. Type: Text. (joomla) -->";
+				$this->configFieldSets[] = "\t\t<!--".$this->setLine(__LINE__)." Email reply to Field. Type: Text. (joomla) -->";
 				$this->configFieldSets[] = "\t\t<field";
 				$this->configFieldSets[] = "\t\t\ttype=\"text\"";
-				$this->configFieldSets[] = "\t\t\tname=\"emailreply\"";
+				$this->configFieldSets[] = "\t\t\tname=\"replyto\"";
 				$this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_EMAILREPLY_LABEL\"";
 				$this->configFieldSets[] = "\t\t\tsize=\"60\"";
 				$this->configFieldSets[] = "\t\t\tmaxlength=\"150\"";
@ -12797,10 +12851,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 				$this->configFieldSets[] = "\t\t\thint=\"".$lang."_EMAILREPLY_HINT\"";
 				$this->configFieldSets[] = "\t\t\tshowon=\"mailer:smtp,sendmail,default\"";
 				$this->configFieldSets[] = "\t\t/>\t\t";
-				$this->configFieldSets[] = "\t\t<!--".$this->setLine(__LINE__)." Replyname Field. Type: Text. (joomla) -->";
+				$this->configFieldSets[] = "\t\t<!--".$this->setLine(__LINE__)." Reply to name Field. Type: Text. (joomla) -->";
 				$this->configFieldSets[] = "\t\t<field";
 				$this->configFieldSets[] = "\t\t\ttype=\"text\"";
-				$this->configFieldSets[] = "\t\t\tname=\"replyname\"";
+				$this->configFieldSets[] = "\t\t\tname=\"replytoname\"";
 				$this->configFieldSets[] = "\t\t\tlabel=\"".$lang."_REPLYNAME_LABEL\"";
 				$this->configFieldSets[] = "\t\t\tsize=\"60\"";
 				$this->configFieldSets[] = "\t\t\tmaxlength=\"150\"";
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -149,10 +149,12 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);

 			// ###CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] 
+				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
 			
 			// ###BOTH_CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] 
+				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
 			
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
@ -168,14 +170,16 @@ class Infusion extends Interpretation
 			{
 				// ###ADMIN_GLOBAL_EVENT###
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Admin Event';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] 
+					.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 				// ###ADMIN_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Admin Event Method.';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] 
+					.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 			}
 			
@ -258,7 +262,8 @@ class Infusion extends Interpretation
                                        $this->setLockLicensePer($viewName_list, $this->target);

                                        // ###FIELDSETS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
+                                        $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] 
+						= $this->setFieldSet($view, $this->fileContentStatic['###component###']);

                                        // ###ACCESSCONTROL### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single);
@ -281,11 +286,14 @@ class Infusion extends Interpretation
                                        // ###AJAXTOKE### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single);

-                                        if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
+                                        if (isset($this->customScriptBuilder['php_document'][$viewName_single]) 
+						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
                                        {
                                                // ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
                                                $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
-                                                        = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['php_document'][$viewName_single], $this->placeholders);
+                                                        = PHP_EOL.$this->setPlaceholders(
+								$this->customScriptBuilder['php_document'][$viewName_single], 
+								$this->placeholders);
                                                // clear some memory
                                                unset($this->customScriptBuilder['php_document'][$viewName_single]);
                                        }
@ -298,7 +306,8 @@ class Infusion extends Interpretation
                                        $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = '';

                                        // ###VALIDATEFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
+                                        $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] 
+						= $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);

                                        // ###EDITBODY### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
@ -322,16 +331,20 @@ class Infusion extends Interpretation
                                        $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';

                                        // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] 
+						= $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);

                                        // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] 
+						= $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);

                                        // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] 
+						= $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);

                                        // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] 
+						= $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);

                                        // ###CHECKBOX_SAVE### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@ -340,9 +353,12 @@ class Infusion extends Interpretation
                                        $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);

                                        // ###POSTSAVEHOOK### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, PHP_EOL."\t\treturn;", PHP_EOL.PHP_EOL."\t\treturn;");
+                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] 
+						= $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, 
+							PHP_EOL."\t\treturn;", PHP_EOL.PHP_EOL."\t\treturn;");

-                                        if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
+                                        if (isset($this->customScriptBuilder['css_view'][$viewName_single]) 
+						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
                                        {
                                                // ###VIEWCSS### <<<DYNAMIC>>>
                                                $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
@ -358,7 +374,8 @@ class Infusion extends Interpretation
                                        // add css to front end
                                        if ($view['edit_create_site_view'])
                                        {
-                                                $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
+                                                $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] 
+							= $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
                                        }
                                }
                                // set the views names
@ -409,9 +426,11 @@ class Infusion extends Interpretation
                                        if ($view['checkin'] == 1)
                                        {
                                                // ###AUTOCHECKIN### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']);
+                                                $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###']
+							= $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']);
                                                // ###CHECKINCALL### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall();
+                                                $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###']
+							= $this->setCheckinCall();
                                        }
                                        else
                                        {
@ -421,19 +440,26 @@ class Infusion extends Interpretation
                                                $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = '';
                                        }
 					// ###ADMIN_CUSTOM_BUTTONS_LIST###
-                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###'] = $this->setCustomButtons($view, 3, "\t");
+                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###']
+						= $this->setCustomButtons($view, 3, "\t");
+                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST###'] 
+						= $this->setFunctionOnlyButtons();

                                        // ###GET_ITEMS_METHOD_STRING_FIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
+                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###']
+						= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);

                                        // ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
+                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###']
+						= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);

                                        // ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
+                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###']
+						= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);

                                        // ###SELECTIONTRANSLATIONFIXFUNC### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']);
+                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###']
+						= $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']);

                                        // ###FILTER_FIELDS### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list);
@ -455,28 +481,34 @@ class Infusion extends Interpretation
                                        {
                                                $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = '';
                                        }
-                                        $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single,$viewName_list);
+                                        $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] 
+						.= $this->setRouterCategoryViews($viewName_single,$viewName_list);

                                        // ###OTHERFILTERS### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list);

                                        // ###FILTERFUNCTIONS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single,$viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] 
+						= $this->setFilterFunctions($viewName_single,$viewName_list);

                                        // ###LISTQUERY### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single,$viewName_list);

                                        // ###MODELEXPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] 
+						= $this->setModelExportMethod($viewName_single, $viewName_list);

                                        // ###MODELEXIMPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] 
+						= $this->setControllerEximportMethod($viewName_single, $viewName_list);

                                        // ###EXPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] 
+						= $this->setExportButton($viewName_single, $viewName_list);

                                        // ###IMPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] 
+						= $this->setImportButton($viewName_single, $viewName_list);

                                        // ###LISTHEAD### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single,$viewName_list);
@ -488,9 +520,11 @@ class Infusion extends Interpretation
                                        $this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list);

                                        // ###JVIEWLISTCANDO### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single,$viewName_list);
+                                        $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] 
+						= $this->setJviewListCanDo($viewName_single,$viewName_list);

-                                        if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
+                                        if (isset($this->customScriptBuilder['css_views'][$viewName_list]) 
+						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
                                        {
                                                // ###VIEWCSS### <<<DYNAMIC>>>
                                                $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
@ -524,28 +558,36 @@ class Infusion extends Interpretation
                                $this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build

                                // ###JCONTROLLERFORM_ALLOWADD### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] 
+					= $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);

                                // ###JCONTROLLERFORM_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] 
+					= $this->setJcontrollerAllowEdit($viewName_single,$viewName_list);

                                // ###JMODELADMIN_GETFORM### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] 
+					= $this->setJmodelAdminGetForm($viewName_single,$viewName_list);

                                // ###JMODELADMIN_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] 
+					= $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list);

                                // ###JMODELADMIN_CANDELETE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] 
+					= $this->setJmodelAdminCanDelete($viewName_single,$viewName_list);

                                // ###JMODELADMIN_CANEDITSTATE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single,$viewName_list);
+                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] 
+					= $this->setJmodelAdminCanEditState($viewName_single,$viewName_list);

                                // set custom admin view Toolbare buttons
                                // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list);
+                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] 
+					= $this->setCustomAdminDynamicButton($viewName_list);
                                // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list);
+                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] 
+					= $this->setCustomAdminDynamicButtonController($viewName_list);

                                // set helper router
                                if (!isset($this->fileContentStatic['###ROUTEHELPER###']))
@ -597,7 +639,8 @@ class Infusion extends Interpretation
                                        }
                                        if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
                                        {
-                                                $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description;
+                                                $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+							= $view['settings']->description;
                                        }
                                        // ###ICOMOON### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon'];
@ -622,7 +665,8 @@ class Infusion extends Interpretation
                                        if ($view['settings']->main_get->gettype == 1)
                                        {
                                                // check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
+                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
                                                {
                                                        // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
@ -637,10 +681,12 @@ class Infusion extends Interpretation
                                                }

                                                // ###CUSTOM_ADMIN_GET_ITEM### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
+                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] 
+							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");

                                                // check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
+                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
                                                {
                                                        // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
@ -657,10 +703,12 @@ class Infusion extends Interpretation
                                        elseif ($view['settings']->main_get->gettype == 2)
                                        {
                                                // ###CUSTOM_ADMIN_GET_LIST_QUERY### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
+                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] 
+							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);

                                                // check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
+                                                if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
                                                {
                                                        // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
@ -675,7 +723,8 @@ class Infusion extends Interpretation
                                                }

                                                // check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
+                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
                                                {
                                                        // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
@ -690,10 +739,12 @@ class Infusion extends Interpretation
                                                }

                                                // ###CUSTOM_ADMIN_GET_ITEMS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
+                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] 
+							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);

                                                // check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
+                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
                                                {
                                                        // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
@ -709,20 +760,25 @@ class Infusion extends Interpretation
                                        }

                                        // ###CUSTOM_ADMIN_CUSTOM_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
+                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
+						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
+						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
                                        // ###CUSTOM_ADMIN_DIPLAY_METHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
+                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] 
+						= $this->setCustomViewDisplayMethod($view);
                                        // set document details
                                        $this->setPrepareDocument($view);
                                        // ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
+                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] 
+						= $this->setCustomViewExtraDisplayMethods($view);
                                        // ###CUSTOM_ADMIN_CODE_BODY### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
                                        // ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
                                        // ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view);
+                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] 
+						= $this->setCustomViewSubmitButtonScript($view);

                                        // setup the templates
                                        $this->setCustomViewTemplateBody($view);
@ -882,7 +938,8 @@ class Infusion extends Interpretation
 					}
 					
 					// insure the needed route helper is loaded
-					$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
+					$this->fileContentStatic['###ROUTEHELPER###'] 
+						.= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
 					// build route details 
 					$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code, $view);
 					$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
@ -890,9 +947,11 @@ class Infusion extends Interpretation
 					if ($view['settings']->main_get->gettype == 1)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 1);
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+							= $this->setUserPermissionCheckAccess($view, 1);
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
+						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
@ -907,10 +966,12 @@ class Infusion extends Interpretation
 						}

 						// ###SITE_GET_ITEM### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] 
+							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");

 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
+						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
@ -927,12 +988,15 @@ class Infusion extends Interpretation
 					elseif ($view['settings']->main_get->gettype == 2)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 2);					
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+							= $this->setUserPermissionCheckAccess($view, 2);					
 						// ###SITE_GET_LIST_QUERY### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] 
+							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);

 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
+						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
@ -947,10 +1011,12 @@ class Infusion extends Interpretation
 						}
 						
 						// ###SITE_GET_ITEMS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] 
+							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
 						
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
+						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
@ -971,17 +1037,22 @@ class Infusion extends Interpretation
 					}
 					if (!isset($this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
 					{
-						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description;
+						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+							= $view['settings']->description;
 					}
 					// ###SITE_CUSTOM_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
+						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
+						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
 					// ###SITE_DIPLAY_METHOD### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] 
+						= $this->setCustomViewDisplayMethod($view);
 					// set document details
 					$this->setPrepareDocument($view);
 					// ###SITE_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] 
+						= $this->setCustomViewExtraDisplayMethods($view);
 					// ###SITE_CODE_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###SITE_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 					// ###SITE_BODY### <<<DYNAMIC>>>
@ -990,9 +1061,15 @@ class Infusion extends Interpretation
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
 				}
+				// if no default site view was set, the redirect to root
+				if (!isset($this->fileContentStatic['###SITE_DEFAULT_VIEW###']))
+				{
+					$this->fileContentStatic['###SITE_DEFAULT_VIEW###'] = '';
+				}
 				// set site custom script to helper class
 				// ###SITE_CUSTOM_HELPER_SCRIPT###
-				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] 
+					= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
 				// ###SITE_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
 				// ###SITE_GLOBAL_EVENT###
@ -1001,14 +1078,17 @@ class Infusion extends Interpretation
 				if ($this->componentData->add_site_event == 1)
 				{
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Site Event';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] 
+						.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 					// ###SITE_GLOBAL_EVENT_HELPER###
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Site Event Method.';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] 
+						.= PHP_EOL."\t".'public static function globalEvent($document)';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] 
+						.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 				}
 				// setup the layouts
@ -1042,7 +1122,8 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL,$this->configFieldSets);
 			
 			// check if this has been set
-			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
+			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) 
+				|| !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
 			{
 				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = 0;
 			}
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@ -39,8 +39,29 @@ abstract class ComponentbuilderHelper
 	{
 		// the Session keeps track of all data related to the current session of this user
 		self::loadSession();
-	} 
+	}  

+	/*
+	 * get all component IDs
+	 */
+	public static function getComponentIDs()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('id')));
+		$query->from($db->quoteName('#__componentbuilder_joomla_component'));
+		$query->where($db->quoteName('published') . ' >= 1'); // do not backup trash
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{			
+				return $db->loadColumn();
+		}
+		return false;
+	}
+
 	/*
 	 * Autoloader
 	 */
@ -77,8 +98,43 @@ abstract class ComponentbuilderHelper
 		// load this for all
 		jimport('joomla.application');
 	}
-
+	
 	/**
+	 * Remove folders with files
+	 * 
+	 * @param   string   $dir  The path to folder to remove
+	 * @param   boolean   $git  if there is a git folder in that must not be removed
+	 *
+	 * @return  boolean   True in all is removed
+	 * 
+	 */
+	public static function removeFolder($dir, $git = false)
+	{
+		if (JFolder::exists($dir))
+		{
+			$it = new RecursiveDirectoryIterator($dir);
+			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+			foreach ($it as $file)
+			{
+				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
+				if ($file->isDir())
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFolder::delete($file->getPathname());
+				}
+				else
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFile::delete($file->getPathname());
+				}
+			}
+			if (!$git && JFolder::delete($dir))
+			{
+				return true;
+			}
+		}
+		return false;
+	}	/**
 	* 	The dynamic builder of views, tables and fields
 	**/
 	public static function dynamicBuilder(&$data, $type)
@ -130,69 +186,39 @@ abstract class ComponentbuilderHelper
 		}
 		return false;
 	}
-	
-	/**
-	 * Remove folders with files
-	 * 
-	 * @param   string   $dir  The path to folder to remove
-	 * @param   boolean   $git  if there is a git folder in that must not be removed
-	 *
-	 * @return  boolean   True in all is removed
-	 * 
-	 */
-	public static function removeFolder($dir, $git = false)
-	{
-		if (JFolder::exists($dir))
-		{
-			$it = new RecursiveDirectoryIterator($dir);
-			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
-			foreach ($it as $file)
-			{
-				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
-				if ($file->isDir())
-				{
-					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
-					JFolder::delete($file->getPathname());
-				}
-				else
-				{
-					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
-					JFile::delete($file->getPathname());
-				}
-			}
-			if (!$git && JFolder::delete($dir))
-			{
-				return true;
-			}
-		}
-		return false;
-	}

 	/**
 	* 	Create file and write data to the file
 	**/
 	public static function writeFile($path, $data)
 	{
+		$klaar = false;
+		// open the file
 		$fh = fopen($path, "w");
 		if (!is_resource($fh))
 		{
-			return false;
+			return $klaar;
 		}
+		// write to the file
 		if (fwrite($fh, $data))
 		{
-			// close file.
-			fclose($fh);
-			return true;
+			// has been done
+			$klaar = true;
 		}
 		// close file.
 		fclose($fh);
-		return false;
+		return $klaar;
 	}

 	/**
 	* 	The user notice info File Name
 	**/
 	protected static $usernotice = false;
+
+	/**
+	* 	The backup hash file name
+	**/
+	protected static $backuphash = false;
 	
 	public static function getFilePath($type, $name = 'listing', $key = '', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE)
 	{
@ -1053,7 +1079,7 @@ abstract class ComponentbuilderHelper
 			$script['ext'][] = "\t * @return  boolean  True on success";
 			$script['ext'][] = "\t *";
 			$script['ext'][] = "\t */";
-			$script['ext'][] = "\tprotected function checkExtention(\$file)";
+			$script['ext'][] = "\tprotected function checkExtension(\$file)";
 			$script['ext'][] = "\t{";
 			$script['ext'][] = "\t\t// check the extention";
 			$script['ext'][] = "\t\tswitch(strtolower(pathinfo(\$file, PATHINFO_EXTENSION)))";
@ -1131,7 +1157,31 @@ abstract class ComponentbuilderHelper
 		}
 		return self::$localSession[$key];
 	}
-			  
+			 
+
+	/**
+	* 	check if it is a new hash
+	**/
+	public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '',  $fileType = '.txt')
+	{
+		// make sure we have a hash
+		if (self::checkString($hash))
+		{
+			// first get the file path
+			$path_filename = self::getFilePath($name, $type, $key, $fileType, JPATH_COMPONENT_ADMINISTRATOR);
+			// set as read if not already set
+			if (($content = @file_get_contents($path_filename)) !== FALSE)
+			{
+				if ($hash == $content)
+				{
+					return false;
+				}
+			}
+			// set the hash
+			return self::writeFile($path_filename, $hash);
+		}
+		return false;
+	}
 	/**
 	*	Load the Component xml manifest.
 	**/
@ -1670,7 +1720,14 @@ abstract class ComponentbuilderHelper
 			$query = $db->getQuery(true);

 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#_'.$main.'_'.$table));
+			if (empty($table))
+			{
+				$query->from($db->quoteName('#__'.$main));
+			}
+			else
+			{
+				$query->from($db->quoteName('#_'.$main.'_'.$table));
+			}
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@ -1953,12 +2010,20 @@ abstract class ComponentbuilderHelper
 	**/
 	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = 'componentbuilder')
 	{
-		// load some joomla helpers
-		JLoader::import('joomla.application.component.model');
 		// load the model file
-		JLoader::import( $name, $path . '/models' );
-		// return instance
-		return JModelLegacy::getInstance( $name, $component.'Model' );
+		JModelLegacy::addIncludePath( $path . '/models' );
+		// get instance
+		$model = JModelLegacy::getInstance( $name, $component.'Model' );
+		// if model not found
+		if ($model == false)
+		{
+			// build class name
+			$class = $prefix.$name;
+			// initilize the model
+			new $class();
+			$model = JModelLegacy::getInstance($name, $prefix);
+		}
+		return $model;
 	}
 	
 	/**
@ -2165,10 +2230,16 @@ abstract class ComponentbuilderHelper
 		return false;
 	}

+	// typo sorry!
 	public static function sorten($string, $length = 40, $addTip = true)
+	{
+		return self::shorten($string, $length, $addTip);
+	}
+
+	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
-        {
+		{
 			$initial = strlen($string);
 			$words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE);
 			$words_count = count($words);
@ -2188,7 +2259,7 @@ abstract class ComponentbuilderHelper
 			$final	= strlen($newString);
 			if ($initial != $final && $addTip)
 			{
-				$title = self::sorten($string, 400 , false);
+				$title = self::shorten($string, 400 , false);
 				return '<span class="hasTip" title="'.$title.'" style="cursor:help">'.trim($newString).'...</span>';
 			}
 			elseif ($initial != $final && !$addTip)
@ -2287,15 +2358,15 @@ abstract class ComponentbuilderHelper
                return '';
 	}

-        public static function htmlEscape($var, $charset = 'UTF-8', $sorten = false, $length = 40)
+        public static function htmlEscape($var, $charset = 'UTF-8', $shorten = false, $length = 40)
 	{
 		if (self::checkString($var))
 		{
 			$filter = new JFilterInput();
 			$string = $filter->clean(html_entity_decode(htmlentities($var, ENT_COMPAT, $charset)), 'HTML');
-			if ($sorten)
+			if ($shorten)
 			{
-                                return self::sorten($string,$length);
+                                return self::shorten($string,$length);
 			}
 			return $string;
                }
--- a/admin/helpers/componentbuilderemail.php
+++ b/admin/helpers/componentbuilderemail.php
@ -0,0 +1,348 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.5.0
+	@build			21st August, 2017
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		componentbuilderemail.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/**
+ * Componentbuilder component email helper
+ */
+abstract class ComponentbuilderEmail
+{
+	/**
+	 * Configuraiton object
+	 *
+	 * @var    JConfig
+	 */
+	public static $config = null;
+
+	/**
+	 * Mailer object
+	 *
+	 * @var    JMail
+	 */
+	public static $mailer = null;
+
+	/**
+	 * Get a configuration object
+	 *
+	 */
+	public static function getConfig()
+	{
+		if (!self::$config)
+		{
+			self::$config = JComponentHelper::getParams('com_componentbuilder');
+		}
+
+		return self::$config;
+	}
+	
+	/**
+	 * Get a mailer object.
+	 *
+	 * Returns the global {@link JMail} object, only creating it if it doesn't already exist.
+	 *
+	 * @return  JMail object
+	 *
+	 * @see     JMail
+	 */
+	public static function getMailer()
+	{
+		if (!self::$mailer)
+		{
+			self::$mailer = self::createMailer();
+		}
+
+		$copy = clone self::$mailer;
+
+		return $copy;
+	}
+
+	/**
+	 * Create a mailer object
+	 *
+	 * @return  JMail object
+	 *
+	 * @see     JMail
+	 */
+	protected static function createMailer() 
+	{
+		// set component params
+		$conf = self::getConfig();
+		
+		// now load the mailer
+		$mailer = $conf->get('mailer', 'global');
+		
+		// Create a JMail object
+		$mail = JMail::getInstance();
+
+		// check if set to global
+		if ('global' == $mailer)
+		{
+			// get the global details
+			$globalConf	= JFactory::getConfig();
+			
+			$mailer		= $globalConf->get('mailer');
+			$smtpauth	= ($globalConf->get('smtpauth') == 0) ? null : 1;
+			$smtpuser	= $globalConf->get('smtpuser');
+			$smtppass	= $globalConf->get('smtppass');
+			$smtphost	= $globalConf->get('smtphost');
+			$smtpsecure	= $globalConf->get('smtpsecure');
+			$smtpport	= $globalConf->get('smtpport');
+			$sendmail	= $globalConf->get('sendmail');
+			$mailfrom	= $globalConf->get('mailfrom');
+			$fromname	= $globalConf->get('fromname');
+			$replyto	= $globalConf->get('replyto');
+			$replytoname	= $globalConf->get('replytoname');
+		}
+		else
+		{
+			$smtpauth 	= ($conf->get('smtpauth') == 0) ? null : 1;
+			$smtpuser 	= $conf->get('smtpuser');
+			$smtppass 	= $conf->get('smtppass');
+			$smtphost 	= $conf->get('smtphost');
+			$smtpsecure	= $conf->get('smtpsecure');
+			$smtpport 	= $conf->get('smtpport');
+			$sendmail	= $conf->get('sendmail');
+			$mailfrom	= $conf->get('mailfrom');
+			$fromname	= $conf->get('fromname');
+			$replyto	= $conf->get('replyto');
+			$replytoname	= $conf->get('replytoname');
+		}
+			
+		// set the global reply-to if found
+		if ($replyto && $replytoname)
+		{
+			$mail->ClearReplyTos();
+			$mail->addReplyTo( array( $replyto, $replytoname ) );
+		}
+
+		// Set global sender
+		$mail->setSender(array($mailfrom, $fromname));
+
+		// Default mailer is to use PHP's mail function
+		switch ($mailer)
+		{
+			case 'smtp':
+				// set the SMTP option
+				$mail->useSMTP($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
+				break;
+
+			case 'sendmail':
+				// set the sendmail option
+				$mail->useSendmail($sendmail);
+				$mail->IsSendmail();
+				break;
+
+			default:
+				$mail->IsMail();
+				break;
+		}
+
+		return $mail;
+	}
+
+	/**
+	 * Send an email
+	 *
+	 * @return  bool on success
+	 *
+	 */
+	public static function send($recipient, $subject, $body, $textonly, $mode = 0, $bounce_email = null, $idsession = null, $mailreply = null, $replyname = null , $mailfrom = null, $fromname = null, $cc = null, $bcc = null, $attachment = null, $embeded = null , $embeds = null)
+	{
+		
+	 	// Get a JMail instance
+		$mail = self::getMailer();
+		
+		// set component params
+		$conf = self::getConfig();
+		
+		// do some house cleaning
+		$mail->ClearReplyTos();
+		
+		// set if we have override
+		if ($mailfrom && $fromname)
+		{
+			$mail->setSender(array($mailfrom, $fromname));
+		}
+		
+		// load the bounce email as sender if set
+		if (!is_null($bounce_email))
+		{
+		
+			$mail->Sender = $bounce_email;
+		}
+		
+		// Add tag to email to identify it 
+		if (!is_null($idsession))
+		{
+			$mail->addCustomHeader('X-VDMmethodID:'.$idsession);
+		}
+		
+		// set the subject & Body
+		$mail->setSubject($subject);
+		$mail->setBody($body);
+		
+		// Are we sending the email as HTML?
+		if ($mode)
+		{
+			$mail->IsHTML(true);
+			$mail->AltBody = $textonly;
+		}
+
+		//embed images
+		if ($embeded)
+		{
+			if(ComponentbuilderHelper::checkArray($embeds))
+			{
+				foreach($embeds as $embed)
+				{
+					$mail->AddEmbeddedImage($embed->Path,$embed->FileName);
+				}
+			}
+		}
+
+		$mail->addRecipient($recipient);
+		$mail->addCC($cc);
+		$mail->addBCC($bcc);
+		$mail->addAttachment($attachment);
+
+		// Take care of reply email addresses
+		if (is_array($mailreply))
+		{
+			$mail->ClearReplyTos();
+			$numReplyTo = count($mailreply);
+			for ($i=0; $i < $numReplyTo; $i++)
+			{
+				$mail->addReplyTo($mailreply[$i], $replyname[$i]);
+			}
+		}
+		elseif (!empty($mailreply))
+		{
+			$mail->ClearReplyTos();
+			$mail->addReplyTo($mailreply, $replyname);
+		}
+		
+		// check if we can add the DKIM to email
+		if ($conf->get('enable_dkim'))
+		{
+			if (!empty($conf->get('dkim_domain')) && !empty($conf->get('dkim_selector')) && !empty($conf->get('dkim_private')) && !empty($conf->get('dkim_public')))
+			{
+				$mail->DKIM_domain	= $conf->get('dkim_domain');
+				$mail->DKIM_selector	= $conf->get('dkim_selector');
+				$mail->DKIM_identity	= $conf->get('dkim_identity');
+				$mail->DKIM_passphrase	= $conf->get('dkim_passphrase');
+				
+				$tmp			= tempnam(sys_get_temp_dir(), 'VDM');
+				$h			= fopen($tmp, 'w');
+				fwrite($h, $conf->get('dkim_private'));
+				fclose($h);
+				$mail->DKIM_private	= $tmp;
+			}
+		}
+		
+		$sendmail = $mail->Send();
+		
+		if ($conf->get('enable_dkim') && !empty($conf->get('dkim_domain')) && !empty($conf->get('dkim_selector')) && !empty($conf->get('dkim_private')) && !empty($conf->get('dkim_public')))
+		{
+			@unlink($tmp);
+		}
+		
+		if (method_exists('ComponentbuilderHelper','storeMessage'))
+		{
+			// store the massage if the method is set
+			ComponentbuilderHelper::storeMessage($sendmail, $recipient, $subject, $body, $textonly, $mode, 'email');
+		}
+		
+		return $sendmail;
+	}
+
+	/**
+	 * Set html text (in a row) and subject (as title) to a email table.
+	 *      do not use <p> instead use <br />
+	 *	in your html that you pass to this method
+	 *      since it is a table row it does not
+	 *      work well with paragraphs
+	 *
+	 * @return  string on success
+	 *
+	 */
+	public static function setTableBody($html, $subject)
+	{
+		$body = array();
+		$body[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">";
+		$body[] = "<html xmlns=\"http://www.w3.org/1999/xhtml\">";
+		$body[] = "<head>";
+		$body[] = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
+		$body[] = "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>";
+		$body[] = "<title>".$subject."</title>";
+		$body[] = "<style type=\"text/css\">";
+		$body[] = "#outlook a {padding:0;}";
+		$body[] = ".ExternalClass {width:100%;}";
+		$body[] = ".ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} ";
+		$body[] = "p {margin: 0; padding: 0; font-size: 0px; line-height: 0px;} ";
+		$body[] = "table td {border-collapse: collapse;}";
+		$body[] = "table {border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }";
+		$body[] = "img {display: block; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic;}";
+		$body[] = "a img {border: none;}";
+		$body[] = "a {text-decoration: none; color: #000001;}";
+		$body[] = "a.phone {text-decoration: none; color: #000001 !important; pointer-events: auto; cursor: default;}";
+		$body[] = "span {font-size: 13px; line-height: 17px; font-family: monospace; color: #000001;}";
+		$body[] = "</style>";
+		$body[] = "<!--[if gte mso 9]>";
+		$body[] = "<style>";
+		$body[] = "/* Target Outlook 2007 and 2010 */";
+		$body[] = "</style>";
+		$body[] = "<![endif]-->";
+		$body[] = "</head>";
+		$body[] = "<body style=\"width:100%; margin:0; padding:0; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%;\">";
+		$body[] = "\n<!-- body wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" style=\"margin:0; padding:0; width:100%; line-height: 100% !important;\">";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\">";
+		$body[] = "<!-- edge wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" align=\"center\" width=\"800\" >";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\">";
+		$body[] = "<!-- content wrapper -->";
+		$body[] = "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" align=\"center\" width=\"780\">";
+		$body[] = "<tr>";
+		$body[] = "<td valign=\"top\" style=\"vertical-align: top;\">";
+		$body[] = $html;
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / content wrapper -->";
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / edge wrapper -->";
+		$body[] = "</td>";
+		$body[] = "</tr>";
+		$body[] = "</table>";
+		$body[] = "<!-- / page wrapper -->";
+		$body[] = "</body>";
+		$body[] = "</html>";
+
+		return implode("\n", $body);
+	}
+}
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php
@ -26,7 +26,7 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-class HeaderCheck
+class componentbuilderHeaderCheck
 {
 	function js_loaded($script_name)
 	{
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -234,6 +234,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT="Default"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DELETE="Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here"
@ -427,6 +428,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_VIEWS_LABEL="The following fields are ad
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOT_REQUIRED="Not Required"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ONLY_FUNCTION="Only Function"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_DESCRIPTION="Order in relation to tab &amp; alignment of admin and site."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_LABEL="Order in Edit"
@ -581,6 +583,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SCREWDRIVER="Screwdriver"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH="Search"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_DESCRIPTION="Select if the field is to be searchable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_LABEL="Searchable"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SELECTION="Selection"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SETTINGS="Settings"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE="Share"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE_ALT="Share Alt"
@ -651,7 +654,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_LABEL="Title"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type"
-COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="Set the type of view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UINT="UINT"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
@ -702,7 +705,10 @@ COM_COMPONENTBUILDER_AUTHOR="Author"
 COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading"
 COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading"
 COM_COMPONENTBUILDER_BACK="Back"
+COM_COMPONENTBUILDER_BACKUP="Backup"
+COM_COMPONENTBUILDER_BACKUP_FAILED_PLEASE_TRY_AGAIN_IF_THE_ERROR_CONTINUE_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR="Backup failed, please try again. If the error continue, please contact your system administrator."
 COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First"
+COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully"
 COM_COMPONENTBUILDER_BADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Admin view in %s</b> has id mismatch of selected <b>admin view</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BASIC_METHOD="Basic Method"
 COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED="<b>Component in %s</b> has id mismatch of selected <b>component</b>. So the id:%s was removed!"
@ -728,8 +734,10 @@ COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMO
 COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Site view in %s</b> has id mismatch of selected <b>site view</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="<b>Snippet</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="<b>View table main</b> id:%s mismatch in <b>%s</b>."
+COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there."
 COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp"
 COM_COMPONENTBUILDER_COMPANY="Company"
+COM_COMPONENTBUILDER_COMPANY_S="Company: %s"
 COM_COMPONENTBUILDER_COMPILER="Compiler"
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
 COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
@ -744,15 +752,76 @@ COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
 COM_COMPONENTBUILDER_COMPONENT_GLOBAL_SETTINGS="Component Global Settings"
 COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
+COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call."
+COM_COMPONENTBUILDER_CONFIG_API_LABEL="API User"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR="Author Info"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_DESC="The email address of the author of this component."
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_LABEL="Author Email"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_DESC="The name of the author of this component."
 COM_COMPONENTBUILDER_CONFIG_AUTHOR_NAME_LABEL="Author Name"
 COM_COMPONENTBUILDER_CONFIG_AUTO_LOAD="Auto"
+COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION="You can run a cronjob that will backup all your components as they are mapped in JCB.<br /><br /><b>USE THE FOLLOWING:</b> <span id='cronjob-backup'>loading...<span class='loading-dots' ></span></span><br /><br />Please not that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677
+<script  type='text/javascript'>
+jQuery(document).ready(function($) {
+	// get token from the form
+	$('form :input').each(function(index, elm){
+		if (elm.name.length == 32 && elm.type == 'hidden')
+		{
+			value = $(elm).val();
+			if (1 == value)
+			{
+				token = elm.name;
+			}
+		}
+	});
+	// nice little dot trick :)
+	var x=0;
+	setInterval(function() {
+		var dots = '';
+		x++;
+		for (var y=0; y < x%11; y++) {
+			dots+='.';
+		}
+		jQuery('.loading-dots').text(dots);
+	} , 500);
+	// now get the Cron Path
+	getCronPath('backup', token);
+});
+function getCronPath_server(getType, token){
+	var getUrl = 'index.php?option=com_componentbuilder&task=ajax.getCronPath&format=json';
+	if(token.length > 0 && getType.length > 0){
+		var request = 'token='+token+'&getType='+getType;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+function getCronPath(getType, token){
+	 getCronPath_server(getType, token).done(function(result) {
+		if(result.path){
+			jQuery('#cronjob-'+getType).html(result.path);
+		} else if (result.error) {
+			jQuery('#cronjob-'+getType).html(result.error);
+		} else {
+			jQuery('#cronjob-'+getType).html('<span style=\'color: red;\'>Error loading path!</span>');
+		}
+	})
+}
+</script>"
+COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL="Backup JCB Mapped Components"
+COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION="Enter the email where the <b>backup key</b> should be send. It will only send an email if a key change is detected, and not on every backup."
+COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT="Email Address Here"
+COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL="Email (backup key)"
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to the backup folder."
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_HINT="/home/user/backup"
 COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_LABEL="Backup Folder Path"
+COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION="Enter Package Name Here"
+COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
+COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL="Package Name"
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_DESC="Set the basic local key here."
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_LABEL="Basic Key <small>(basic encryption)</small>"
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_DESC="When using the basic encryption please use a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>"
@ -788,10 +857,44 @@ COM_COMPONENTBUILDER_CONFIG_CONTRIBUTOR_USE_EMAIL="Email"
 COM_COMPONENTBUILDER_CONFIG_CONTRIBUTOR_USE_LABEL="Use"
 COM_COMPONENTBUILDER_CONFIG_CONTRIBUTOR_USE_NONE="None"
 COM_COMPONENTBUILDER_CONFIG_CONTRIBUTOR_USE_WWW="Website"
+COM_COMPONENTBUILDER_CONFIG_CRONJOB="CronJob"
+COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to where all components are backed up to."
+COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT="/home/user/fullbackup"
+COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL="Cronjob Backup Folder Path"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION="Here you can set the path to the custom folder"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT="/home/user/custom"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
+COM_COMPONENTBUILDER_CONFIG_DKIM="DKIM"
+COM_COMPONENTBUILDER_CONFIG_DKIM_DESCRIPTION="Set this option to Yes if you want to sign your emails using DKIM."
+COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_DESCRIPTION="Set the domain. Eg. domain.com"
+COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_HINT="domain.com"
+COM_COMPONENTBUILDER_CONFIG_DKIM_DOMAIN_LABEL="Domain"
+COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_DESCRIPTION="Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email."
+COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_HINT="you@yourdomain.com"
+COM_COMPONENTBUILDER_CONFIG_DKIM_IDENTITY_LABEL="Identity"
+COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_DESCRIPTION="This is the KEY to use in the DNS record."
+COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_HINT="vdm._domainkey"
+COM_COMPONENTBUILDER_CONFIG_DKIM_KEY_LABEL="Key"
+COM_COMPONENTBUILDER_CONFIG_DKIM_LABEL="Enable DKIM"
+COM_COMPONENTBUILDER_CONFIG_DKIM_PASSPHRASE_DESCRIPTION="Enter your passphrase here."
+COM_COMPONENTBUILDER_CONFIG_DKIM_PASSPHRASE_LABEL="Passphrase"
+COM_COMPONENTBUILDER_CONFIG_DKIM_PRIVATE_KEY_DESCRIPTION="set private key"
+COM_COMPONENTBUILDER_CONFIG_DKIM_PRIVATE_KEY_LABEL="Private key"
+COM_COMPONENTBUILDER_CONFIG_DKIM_PUBLIC_KEY_DESCRIPTION="set public key"
+COM_COMPONENTBUILDER_CONFIG_DKIM_PUBLIC_KEY_LABEL="Public key"
+COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_DESCRIPTION="Set your DKIM/DNS selector."
+COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_HINT="vdm"
+COM_COMPONENTBUILDER_CONFIG_DKIM_SELECTOR_LABEL="Selector"
+COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key."
+COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY"
+COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value"
 COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
+COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
+COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here"
+COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email"
+COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_DESCRIPTION="The global email address that will be used to set as the reply email. (leave blank for none)"
+COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_HINT="Email Address Here"
+COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL=" Reply to Email"
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encription key for the field encryption is set here."
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought."
@ -818,26 +921,94 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
+COM_COMPONENTBUILDER_CONFIG_FROMNAME_DESCRIPTION="Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."
+COM_COMPONENTBUILDER_CONFIG_FROMNAME_HINT="From Name Here"
+COM_COMPONENTBUILDER_CONFIG_FROMNAME_LABEL="From Name"
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION="Here you can set the path to the git folder."
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT="/home/user/git"
 COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL="Git Folder Path"
+COM_COMPONENTBUILDER_CONFIG_GLOBAL="Global"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC="The Global Parameters"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL="Global"
 COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD="Gradient"
+COM_COMPONENTBUILDER_CONFIG_MAILER_DESCRIPTION="Select what mailer you would like to use to send emails."
+COM_COMPONENTBUILDER_CONFIG_MAILER_LABEL="Mailer"
+COM_COMPONENTBUILDER_CONFIG_MAILONLINE_DESCRIPTION="Warning this will stop all emails from going out."
+COM_COMPONENTBUILDER_CONFIG_MAILONLINE_LABEL="Mailer Status"
+COM_COMPONENTBUILDER_CONFIG_MAIL_CONFIGURATION="Mail Configuration"
 COM_COMPONENTBUILDER_CONFIG_MINIFY_DESCRIPTION="Should the JavaScript be minified when compiled."
 COM_COMPONENTBUILDER_CONFIG_MINIFY_LABEL="Minify JS"
 COM_COMPONENTBUILDER_CONFIG_NO="No"
+COM_COMPONENTBUILDER_CONFIG_NONE="None"
 COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_DESCRIPTION="You components will be placed as zip files inside this folder."
 COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_LABEL="Adding a backup folder export option"
 COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION="The compiler folder is where all files and folders that is used to build your component is stored, the default location is [administrator/components/com_componentbuilder/compiler]. You can move this folder by adding your own path here. Remember to move all the content of the compiler folder to this new location or it will not work."
 COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL="Moving The Compiler Folder"
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION="The custom folder is where all files and folders that you would like to include in your components are stored, the default location is [administrator/components/com_componentbuilder/custom]. You can move this folder by adding your own path here. Remember to move the content of the default custom folder to this new location."
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL="Moving The Custom Folder"
+COM_COMPONENTBUILDER_CONFIG_NOTE_DKIM_USE_DESCRIPTION="<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
+<script>
+jQuery(document).ready(function()
+{
+	// house cleaning
+        if( !jQuery('#jform_dkim_domain').val() ) {
+            jQuery('#jform_dkim_domain').val(window.location.hostname);
+        }
+        jQuery('#jform_dkim_key').click(function(){
+            jQuery(this).select();
+        });
+        jQuery('#jform_dkim_value').click(function(){
+            jQuery(this).select();
+        });
+        vdm_dkim();
+});
+
+function vdm_dkim() {
+        jQuery('#a_dkim_domain').text(jQuery('#jform_dkim_domain').val());
+	jQuery('#jform_dkim_key').val(jQuery('#jform_dkim_selector').val() + '._domainkey');
+	if( !jQuery('#jform_dkim_public_key').val() ) {
+	        jQuery('#jform_dkim_value').val('v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY');
+        } else {
+	        jQuery('#jform_dkim_value').val('v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=' + jQuery('#jform_dkim_public_key').val());
+        }
+}
+</script>"
+COM_COMPONENTBUILDER_CONFIG_NOTE_DKIM_USE_LABEL="Server Configuration"
 COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION="You must set the folder where all the components should be deployed for git. You will have to still do your git commit and other git commands yourself. Each component will create their own folder inside this git folder."
 COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL="Adding git to your compiler method"
+COM_COMPONENTBUILDER_CONFIG_OFF="Off"
+COM_COMPONENTBUILDER_CONFIG_ON="On"
 COM_COMPONENTBUILDER_CONFIG_ONLY_EXTRA="Only Extra"
+COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION="<code>[YEAR]</code> <code>[MONTH]</code> <code>[DAY]</code> <code>[HOUR]</code> <code>[MINUTE]</code>"
+COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL="Package Name Placeholders"
 COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION="Select percentage any language should be translated before the system should add the language to the component during compilation."
 COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL="Add Language if %? ready."
+COM_COMPONENTBUILDER_CONFIG_PHP_MAIL="PHP Mail"
+COM_COMPONENTBUILDER_CONFIG_REPLYNAME_DESCRIPTION="Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"
+COM_COMPONENTBUILDER_CONFIG_REPLYNAME_HINT="Reply Name Here"
+COM_COMPONENTBUILDER_CONFIG_REPLYNAME_LABEL="Reply to Name"
+COM_COMPONENTBUILDER_CONFIG_SENDMAIL="Sendmail"
+COM_COMPONENTBUILDER_CONFIG_SENDMAIL_DESCRIPTION="Enter the path to the sendmail program directory on your host server."
+COM_COMPONENTBUILDER_CONFIG_SENDMAIL_HINT="/usr/sbin/sendmail"
+COM_COMPONENTBUILDER_CONFIG_SENDMAIL_LABEL="Sendmail Path"
+COM_COMPONENTBUILDER_CONFIG_SMTP="SMTP"
+COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_DESCRIPTION="Select yes if your SMTP host requires SMTP Authentication."
+COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_LABEL="SMTP Authentication"
+COM_COMPONENTBUILDER_CONFIG_SMTPHOST_DESCRIPTION="Enter the name of the SMTP host."
+COM_COMPONENTBUILDER_CONFIG_SMTPHOST_HINT="localhost"
+COM_COMPONENTBUILDER_CONFIG_SMTPHOST_LABEL="SMTP Host"
+COM_COMPONENTBUILDER_CONFIG_SMTPPASS_DESCRIPTION="Enter the password for access to the SMTP host."
+COM_COMPONENTBUILDER_CONFIG_SMTPPASS_LABEL="SMTP Password"
+COM_COMPONENTBUILDER_CONFIG_SMTPPORT_DESCRIPTION="Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers."
+COM_COMPONENTBUILDER_CONFIG_SMTPPORT_HINT="25"
+COM_COMPONENTBUILDER_CONFIG_SMTPPORT_LABEL="SMTP Port"
+COM_COMPONENTBUILDER_CONFIG_SMTPSECURE_DESCRIPTION="Select the security model that your SMTP server uses."
+COM_COMPONENTBUILDER_CONFIG_SMTPSECURE_LABEL="SMTP Security"
+COM_COMPONENTBUILDER_CONFIG_SMTPUSER_DESCRIPTION="Enter the username for access to the SMTP host."
+COM_COMPONENTBUILDER_CONFIG_SMTPUSER_HINT="email@demo.com"
+COM_COMPONENTBUILDER_CONFIG_SMTPUSER_LABEL="SMTP Username"
+COM_COMPONENTBUILDER_CONFIG_SSL="SSL"
+COM_COMPONENTBUILDER_CONFIG_TLS="TLS"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
 for developing fast and powerful web interfaces. For more info visit <a href="http://getuikit.com/" >http://getuikit.com/</a>"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_LABEL="Uikit Settings"
@ -852,6 +1023,7 @@ COM_COMPONENTBUILDER_CONFIRMATION_STEP_BEFORE_IMPORTING="Confirmation Step Befor
 COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
 COM_COMPONENTBUILDER_COPYRIGHT="Copyright"
+COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s"
 COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
@ -1117,6 +1289,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTIFICATION="Notification"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOT_REQUIRED="Not Required"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ONLY_FUNCTION="Only Function"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PALETTE="Palette"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_CENTER="Paragraph Center"
@ -1180,6 +1353,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SCISSORS="Scissors"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SCREEN="Screen"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SCREWDRIVER="Screwdriver"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SEARCH="Search"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SELECTION="Selection"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SHARE="Share"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SHARE_ALT="Share Alt"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SHIELD="Shield"
@ -1217,6 +1391,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_UP="Thumbs Up"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE_TWO="Tree 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNARCHIVE="Unarchive"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNBLOCK="Unblock"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNDO="Undo"
@ -1495,6 +1671,7 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
 COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
 COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install"
+COM_COMPONENTBUILDER_DOWNLOAD="download"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
@ -1801,6 +1978,8 @@ COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EMAIL="Email"
+COM_COMPONENTBUILDER_EMAIL_S="Email: %s"
+COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SEND="Email with the new key was send"
 COM_COMPONENTBUILDER_EMAUTHOREM_BSB="<em>Author</em>: <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="<em>Company:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOMPANY_NAMEEM_BSB="<em>Company Name</em>: <b>%s</b>"
@ -2275,6 +2454,7 @@ COM_COMPONENTBUILDER_IMPORT_TITLE="Data Importer"
 COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found."
 COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA="Import Data"
 COM_COMPONENTBUILDER_IMPORT_UPLOAD_BOTTON="Upload File"
+COM_COMPONENTBUILDER_ISSUE="issue"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT="Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS="Joomla Components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access"
@ -2431,6 +2611,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_DESCRIPTION="The Author's Name &amp
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT="Author Name &amp; Surname Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACK="Back"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKWARD_CIRCLE="Backward Circle"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BAN_CIRCLE="Ban Circle"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BARS="Bars"
@ -2457,6 +2639,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_HINT="// Add MySQL Table Dump
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL="MySQL"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION="To build the component fields and back-end views dynamically using a mySQL table file."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Builder - Backup Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CALENDAR="Calendar"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CALENDAR_THREE="Calendar 3"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CALENDAR_TWO="Calendar 2"
@ -2766,8 +2949,9 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo
 ## Donations<br />
 <br />
 If you want to support this project, please consider donating:<br />
- * PayPal: pay@vdm.io<br />
- * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh
+ * PayPal: [paypal.me/payvdm](https://www.paypal.me/payvdm)<br />
+ * Bitcoin: 1FLxiT6wyxgZ3boeviLkYJ1DRpp41uzpxa<br />
+ * Ethereum: 0x243392daa3c9c8bc841fcacf7c7f72541cb16823
 </code></div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL="Demo README (with all place-holders)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION="Add your FTP signature in the given field and during compilation the file will be moved to the FTP folder. You still need to point the above <b>update server</b> url to the xml file on your FTP server for it to work correctly.<br /><b>Here are the details of the signature:</b><br />&nbsp;&nbsp;&nbsp;string $host = '127.0.0.1'<br />&nbsp;&nbsp;&nbsp;string $port = '21'<br />&nbsp;&nbsp;&nbsp;array $options = array()<br />&nbsp;&nbsp;&nbsp;string $user = null<br />&nbsp;&nbsp;&nbsp;string $pass = null<br />&nbsp;&nbsp;&nbsp;OPTIONS = Array with any of these options:<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY]<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;timeout=>(int)<br /><b>Here is an example signature:</b><br /><code>host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password</code>"
@ -3009,6 +3193,7 @@ COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS="- Keep Original Access -"
 COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -"
 COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE="- Keep Original State -"
 COM_COMPONENTBUILDER_KEY="Key"
+COM_COMPONENTBUILDER_KEY_HAS_NOT_CHANGED="Key has not changed"
 COM_COMPONENTBUILDER_LANGUAGE="Language"
 COM_COMPONENTBUILDER_LANGUAGES="Languages"
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
@ -3157,6 +3342,8 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC="A count of the number of times this Language has been revised."
 COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING="Last few releases from Github is loading"
+COM_COMPONENTBUILDER_LATEST_RELEASE="Latest Release"
 COM_COMPONENTBUILDER_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_LAYOUTS_ACCESS="Layouts Access"
@ -3261,14 +3448,26 @@ COM_COMPONENTBUILDER_LAYOUT_VERSION_DESC="A count of the number of times this La
 COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LICENSE="License"
+COM_COMPONENTBUILDER_LICENSE_S="License: %s"
 COM_COMPONENTBUILDER_NEW="New"
 COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
 COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
+COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied."
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
-COM_COMPONENTBUILDER_OPENED_BY="opened by"
+COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)"
+COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested."
+COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
+COM_COMPONENTBUILDER_ON_GITHUB="on Github"
+COM_COMPONENTBUILDER_OPEN="Open"
+COM_COMPONENTBUILDER_OPENED="opened"
+COM_COMPONENTBUILDER_OPENED_THIS="opened this"
+COM_COMPONENTBUILDER_OPEN_ON_GITHUB="Open on Github"
+COM_COMPONENTBUILDER_OUT_OF_DATE="Out of date"
+COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET="Owner details was set"
+COM_COMPONENTBUILDER_OWNER_S="Owner: %s"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND="Package owner details not found!"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET="Package Owner Not Set"
@ -3279,6 +3478,7 @@ COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
 COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE="Please select a component that you would like to compile."
 COM_COMPONENTBUILDER_PLEASE_WAIT_CLEARING_THE_TMP_FOLDER="Please wait! Clearing the tmp folder"
 COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT="Ready to compile a component"
+COM_COMPONENTBUILDER_RELEASED_THIS="released this"
 COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github"
 COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
@ -3289,6 +3489,7 @@ COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER="Sho
 COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
 COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported."
 COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during <b>import process</b> before adding the key, this way if the user/dev <b>does not</b> have the key they can see <b>where to get it</b>."
+COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it."
 COM_COMPONENTBUILDER_SITE_VIEW="Site View"
 COM_COMPONENTBUILDER_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
@ -3579,6 +3780,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION="Notification"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
 COM_COMPONENTBUILDER_SITE_VIEW_NOT_REQUIRED="Not Required"
+COM_COMPONENTBUILDER_SITE_VIEW_ONLY_FUNCTION="Only Function"
 COM_COMPONENTBUILDER_SITE_VIEW_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_SITE_VIEW_PALETTE="Palette"
 COM_COMPONENTBUILDER_SITE_VIEW_PARAGRAPH_CENTER="Paragraph Center"
@ -3649,6 +3851,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_SCISSORS="Scissors"
 COM_COMPONENTBUILDER_SITE_VIEW_SCREEN="Screen"
 COM_COMPONENTBUILDER_SITE_VIEW_SCREWDRIVER="Screwdriver"
 COM_COMPONENTBUILDER_SITE_VIEW_SEARCH="Search"
+COM_COMPONENTBUILDER_SITE_VIEW_SELECTION="Selection"
 COM_COMPONENTBUILDER_SITE_VIEW_SHARE="Share"
 COM_COMPONENTBUILDER_SITE_VIEW_SHARE_ALT="Share Alt"
 COM_COMPONENTBUILDER_SITE_VIEW_SHIELD="Shield"
@ -3692,6 +3895,8 @@ COM_COMPONENTBUILDER_SITE_VIEW_TOP_LEFT="Top Left"
 COM_COMPONENTBUILDER_SITE_VIEW_TOP_RIGHT="Top Right"
 COM_COMPONENTBUILDER_SITE_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_SITE_VIEW_TREE_TWO="Tree 2"
+COM_COMPONENTBUILDER_SITE_VIEW_TYPE_DESCRIPTION="for list target"
+COM_COMPONENTBUILDER_SITE_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_SITE_VIEW_UINT="UINT"
 COM_COMPONENTBUILDER_SITE_VIEW_UNARCHIVE="Unarchive"
 COM_COMPONENTBUILDER_SITE_VIEW_UNBLOCK="Unblock"
@ -3946,14 +4151,19 @@ COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC="A count of the number of times this
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_TEMPLATE_YES="Yes"
 COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called <b>settings</b>, bottom right there is a field called <b>Export Key</b>."
+COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
 COM_COMPONENTBUILDER_THE_KEY_OF_THIS_PACKAGE="The key of this package."
 COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
 COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: <code>%s</code>"
+COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_S="The package key is: %s"
 COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading"
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
+COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the <b>JCB Global Options</b>, go to the <b>Company</b> tab and add the correct company details there."
+COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there."
 COM_COMPONENTBUILDER_TRANSLATION="Translation"
+COM_COMPONENTBUILDER_UP_TO_DATE="Up to date"
 COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
 COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
@ -3961,9 +4171,12 @@ COM_COMPONENTBUILDER_USE_KEY="Use Key"
 COM_COMPONENTBUILDER_VDM_NOTICE_BOARD="VDM Notice Board"
 COM_COMPONENTBUILDER_VERSION="Version"
 COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
+COM_COMPONENTBUILDER_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github"
 COM_COMPONENTBUILDER_WEBSITE="Website"
+COM_COMPONENTBUILDER_WEBSITE_S="Website: %s"
 COM_COMPONENTBUILDER_YES="Yes"
 COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEYBR_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY="Your data is encrypted with a AES 128 bit encryption using the above 32 character key.<br />Without this key it will take the current technology with a brute force attack method more then <a href="http://random-ize.com/how-long-to-hack-pass/" target="_blank" title="How long to hack pass">700 000 000 000 000 000 000 000 000 000 000</a> years to crack theoretically."
+COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY_UNLESS_THEY_HAVE_THIS_KEY_ABOVE_SO_DO_KEEP_IT_SAFE="Your data is encrypted with a AES 128 bit encryption using the above 32 character key. Without this key it will take the current technology with a brute force attack method more then <a href="http://random-ize.com/how-long-to-hack-pass/" target="_blank" title="How long to hack pass">700 000 000 000 000 000 000 000 000 000 000</a> years to crack theoretically. Unless they have this key above, so do keep it safe."
 COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL="You can now select the component <b>zip</b> package you would like to import.<br /><small>Please note that smart component import only works with the following format: <b>(.zip)</b></small>"
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!"
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
--- a/admin/layouts/admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/admin_view/linked_components_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
--- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_fullwidth.php
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_left.php
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
--- a/admin/layouts/dynamic_get/gettable_above.php
+++ b/admin/layouts/dynamic_get/gettable_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_above.php
--- a/admin/layouts/dynamic_get/gettable_fullwidth.php
+++ b/admin/layouts/dynamic_get/gettable_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_fullwidth.php
--- a/admin/layouts/dynamic_get/gettable_left.php
+++ b/admin/layouts/dynamic_get/gettable_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_left.php
--- a/admin/layouts/dynamic_get/gettable_right.php
+++ b/admin/layouts/dynamic_get/gettable_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_right.php
--- a/admin/layouts/dynamic_get/gettable_under.php
+++ b/admin/layouts/dynamic_get/gettable_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_under.php
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/field/details_fullwidth.php
+++ b/admin/layouts/field/details_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.4.7
-	@build			18th June, 2017
+	@version		2.5.0
+	@build			21st August, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Llewellyn van der Merwe	9c1ee3e88a	updated the donation info	2017-08-21 02:24:30 +01:00
Llewellyn van der Merwe	e3528344af	Major upgrade, to initiate front-end development for JCB. Little steps at a time forward.	2017-08-20 22:18:16 +01:00
Llewellyn van der Merwe	0ccc84e2ff	fixed the getVars backward compatibility issue, Added replyto and replytoname to email helper, renamed the email helper class that builds the email table to setTableBody	2017-08-20 21:47:14 +01:00
Llewellyn van der Merwe	e0730d3bf6	added JCB initial API frontend to run backups of JCB components, setup automated backup system with cronjob	2017-08-20 18:52:35 +01:00
Llewellyn van der Merwe	ddeb02de74	version upgrade	2017-08-12 19:00:05 +01:00
Llewellyn van der Merwe	e003be492c	Fixed gh-108 to insure that all fields get added if multiple zeros are found. Improved the default value options in global config to allow for array of default values. Fixed typo forward slash.	2017-08-12 12:51:28 +01:00
Llewellyn van der Merwe	fb7b5027c2	improved the answer for gh-106 to insure the correct form is submitted on compile	2017-08-05 12:28:24 +01:00
Llewellyn van der Merwe	7a902d454a	fixed gh-106 to insure the correct form is submitted on compile, also some other minor bug fixes	2017-08-05 12:10:08 +01:00
Llewellyn van der Merwe	bd716ae7ef	Stable Release	2017-07-24 04:28:27 +01:00
Llewellyn van der Merwe	e074d3b5ce	added Joomla to the header in the readme since it has become know as JCB	2017-07-21 00:38:35 +01:00
Llewellyn van der Merwe	f1a054c0e7	Imporved the Adding of Custom Config Fields, added some shields.io icons to the JCB readme	2017-07-21 00:26:48 +01:00
Llewellyn van der Merwe	e037d29935	version upgrade	2017-07-03 01:41:25 +01:00
Llewellyn van der Merwe	b60803ef7b	added timeago lib to repo for jQuery, and added dates to issue and release info on dash	2017-06-29 23:23:06 +01:00
Llewellyn van der Merwe	aceda7bae2	Fixed a bug with the automated update sql that ensured that the sql for new fields gets added.	2017-06-29 22:03:53 +01:00
Llewellyn van der Merwe	111aa4a3de	donation info updated	2017-06-28 21:02:04 +01:00
Llewellyn van der Merwe	9742991690	improved the dashboard of JCB to include releases and better item display of each issue and release	2017-06-28 11:05:31 +01:00