Updated some compiler methods, added footable3, fixed some known issus.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.0.8)
+# Component Builder (2.1.3)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -8,25 +8,19 @@ The Component Builder for Joomla that is highly advanced, truly able to build ex
 
 > **You can purchase Component Builder with the following components as demo setup inside Component Builder:**
 
-+ **Basic Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
++ **Development Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
 
     *Help View Integration*
 
-+ **Medium Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
-
     *Demo Component* see the build on [github] (https://github.com/namibia/demo-joomla-3-component)
 
-    *Sermon Distributor* see the build on [github] (https://github.com/SermonDistributor/Joomla-3-Component)
++ **Dev + Howtos Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
-
-+ **Advanced Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
 
     *All the above*
 
-    *Component Builder* see the build on [github] (https://github.com/vdm-io/Joomla-Component-Builder)
+    *Sermon Distributor* see the build on [github] (https://github.com/SermonDistributor/Joomla-3-Component)
 
-## Training & Help Videos
+    *Training & Help Videos* tutorials in the component included.
-
-The Medium and Advanced Versions come with video tutorials in the component included.
 
 # Extra Support
 
@@ -38,38 +32,38 @@ Would you require more help VDM.io has a number of support plans available [visi
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 30th January, 2016
++ *Last Build*: 22nd April, 2016
-+ *Version*: 2.0.8
++ *Version*: 2.1.3
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 ## Build Time
 
-**221 Hours** or **28 Eight Hour Days** (actual time the author saved -
+**225 Hours** or **28 Eight Hour Days** (actual time the author saved -
 due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **79362**
++ *Line count*: **80585**
-+ *File count*: **489**
++ *File count*: **495**
-+ *Folder count*: **95**
++ *Folder count*: **98**
 
-**146 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**148 Hours** or **19 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @55hours** = codingtime / 4;
+> **debugging @56hours** = codingtime / 4;
 > **planning @32hours** = codingtime / 7;
 > **mapping @22hours** = codingtime / 10;
 > **office @37hours** = codingtime / 6;)
 
-**367 Hours** or **46 Eight Hour Days**
+**373 Hours** or **47 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
 
-Project duration: **9.2 weeks** or **1.9 months**
+Project duration: **9.4 weeks** or **2 months**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
 > Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/joomla_3/DASHJModelList.php

@@ -206,5 +206,5 @@ class ###Component###Model###Component### extends JModelList
 			}
 		}
 		return $icons;
-	}
+	}###DASH_MODEL_METHODS###
 }

admin/compiler/joomla_3/DASHJViewLagacy.php

@@ -51,7 +51,7 @@ class ###Component###View###Component### extends JViewLegacy
 		};
 		// Assign data to the view
 		$this->icons			= $this->get('Icons');
-		$this->contributors		= ###Component###Helper::getContributors();
+		$this->contributors		= ###Component###Helper::getContributors();###DASH_GET_CUSTOM_DATA###
 
 		// Set the toolbar
 		$this->addToolBar();

admin/compiler/joomla_3/DASHdefault.php

@@ -29,22 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-?>
+JHtml::_('behavior.tooltip');
-<div id="j-main-container" class="span9">
-<?php  echo JHtml::_('bootstrap.startAccordion', 'dashboard_left', array('active' => 'main')); ?>
 
-<?php  echo JHtml::_('bootstrap.addSlide', 'dashboard_left', 'cPanel', 'main'); ?>
+?>###DASH_DISPLAY_DATA###
-<?php echo $this->loadTemplate('main');?>
-<?php  echo JHtml::_('bootstrap.endSlide'); ?>
-
-<?php  echo JHtml::_('bootstrap.endAccordion'); ?>
-</div>
-<div id="j-main-container" class="span3">
-<?php  echo JHtml::_('bootstrap.startAccordion', 'dashboard_right', array('active' => 'vdm')); ?>
-
-<?php  echo JHtml::_('bootstrap.addSlide', 'dashboard_right', '###COMPANYNAME###', 'vdm'); ?>
-<?php echo $this->loadTemplate('vdm');?>
-<?php  echo JHtml::_('bootstrap.endSlide'); ?>
-
-<?php  echo JHtml::_('bootstrap.endAccordion'); ?>
-</div>

admin/compiler/joomla_3/Helper.php

@@ -201,7 +201,7 @@ abstract class ###Component###Helper
 		$query = $db->getQuery(true);
 		$query->select(array('a.published'));
 		$query->from('#__###component###_'.$type.' AS a');
-		$query->where('a.id = '.$id);
+		$query->where('a.id = '. (int) $id);
 		$query->where('a.published = 1');
 		$db->setQuery($query);
 		$db->execute();
@@ -219,7 +219,7 @@ abstract class ###Component###Helper
 		$query = $db->getQuery(true);
 		$query->select(array('a.title'));
 		$query->from('#__usergroups AS a');
-		$query->where('a.id = '.$id);
+		$query->where('a.id = '. (int) $id);
 		$db->setQuery($query);
 		$db->execute();
 		$found = $db->getNumRows();
@@ -252,7 +252,7 @@ abstract class ###Component###Helper
 		foreach ($actions as $action)
                 {
 			// set to use component default
-			$allow = true;
+			$fallback= true;
 			if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions))
 			{
 				// The record has been set. Check the record permissions.
@@ -268,13 +268,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 						}
 						elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id))
@@ -284,13 +284,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 						}
 						elseif ($user->authorise('core.edit.own', 'com_###component###'))
@@ -300,13 +300,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 						}
 						elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@@ -316,13 +316,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback= false;
 							}
 						}
 					}
@@ -352,13 +352,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 							}
 							elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid))
@@ -368,13 +368,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 							}
 							elseif ($user->authorise('core.edit.own', 'com_###component###'))
@@ -384,13 +384,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 							}
 							elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@@ -400,13 +400,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback= false;
 								}
 							}
 						}
@@ -414,7 +414,7 @@ abstract class ###Component###Helper
 				}
 			}
 			// if allowed then fallback on component global settings
-			if ($allow)
+			if ($fallback)
 			{
 				$result->set($action->name, $user->authorise($action->name, 'com_###component###'));
 			}
@@ -573,6 +573,16 @@ abstract class ###Component###Helper
 
 	}
 	
+	public static function checkJson($string)
+	{
+		if (self::checkString($string))
+		{
+			json_decode($string);
+			return (json_last_error() === JSON_ERROR_NONE);
+		}
+		return false;
+	}
+
 	public static function checkObject($object)
 	{
 		if (isset($object) && is_object($object) && count($object) > 0)

admin/compiler/joomla_3/Helper_email.php

@@ -0,0 +1,261 @@
+<?php
+/**
+*
+*  @version		2.0.0 - September 03, 2014
+*  @package		Component Builder
+*  @author		Llewellyn van de Merwe <http://www.vdm.io>
+*  @copyright		Copyright (C) 2014. All Rights Reserved
+*  @license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+*
+**/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+/**
+ * ###Component### component email helper
+ */
+abstract class ###Component###Email
+{
+	/**
+	 * 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_###component###');
+		}
+
+		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');
+		}
+		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');
+			$mailreply	= $conf->get('mailreply');
+			$replyname	= $conf->get('replyname');
+			
+			// set the global reply-to
+			if ($mailreply && $fromname)
+			{
+				$mail->ClearReplyTos();
+				$mail->addReplyTo( array( $mailreply, $replyname ) );
+			}
+		}
+
+		// 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(###Component###Helper::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( array($mailreply[$i], $replyname[$i]) );
+			}
+		}
+		elseif (!empty($mailreply))
+		{
+			$mail->ClearReplyTos();
+			$mail->addReplyTo( array( $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);
+		}
+		
+		return $sendmail;
+	}
+}

admin/compiler/joomla_3/Helper_site.php

@@ -333,6 +333,45 @@ abstract class ###Component###Helper
 		return false;
 	} 
 
+	public static function isPublished($id,$type)
+	{
+		if ($type == 'raw')
+                {
+			$type = 'item';
+		}
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select(array('a.published'));
+		$query->from('#__###component###_'.$type.' AS a');
+		$query->where('a.id = '. (int) $id);
+		$query->where('a.published = 1');
+		$db->setQuery($query);
+		$db->execute();
+		$found = $db->getNumRows();
+		if($found)
+                {
+			return true;
+		}
+		return false;
+	}
+
+	public static function getGroupName($id)
+	{
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select(array('a.title'));
+		$query->from('#__usergroups AS a');
+		$query->where('a.id = '. (int) $id);
+		$db->setQuery($query);
+		$db->execute();
+		$found = $db->getNumRows();
+		if($found)
+                {
+			return $db->loadResult();
+		}
+		return $id;
+	}
+	
 	/**
 	*	Get the actions permissions
 	**/
@@ -355,7 +394,7 @@ abstract class ###Component###Helper
 		foreach ($actions as $action)
                 {
 			// set to use component default
-			$allow = true;
+			$fallback = true;
 			if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions))
 			{
 				// The record has been set. Check the record permissions.
@@ -371,13 +410,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 						}
 						elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$view.'.' . (int) $record->id))
@@ -387,13 +426,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 						}
 						elseif ($user->authorise('core.edit.own', 'com_###component###'))
@@ -403,13 +442,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 						}
 						elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@@ -419,13 +458,13 @@ abstract class ###Component###Helper
 							{
 								$result->set($action->name, true);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 							else
 							{
 								$result->set($action->name, false);
 								// set not to use component default
-								$allow = false;
+								$fallback = false;
 							}
 						}
 					}
@@ -455,13 +494,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 							}
 							elseif ($user->authorise($view.'edit.own', 'com_###component###.'.$views.'.category.' . (int) $record->catid))
@@ -471,13 +510,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 							}
 							elseif ($user->authorise('core.edit.own', 'com_###component###'))
@@ -487,13 +526,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 							}
 							elseif ($user->authorise($view.'edit.own', 'com_###component###'))
@@ -503,13 +542,13 @@ abstract class ###Component###Helper
 								{
 									$result->set($action->name, true);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 								else
 								{
 									$result->set($action->name, false);
 									// set not to use component default
-									$allow = false;
+									$fallback = false;
 								}
 							}
 						}
@@ -517,7 +556,7 @@ abstract class ###Component###Helper
 				}
 			}
 			// if allowed then fallback on component global settings
-			if ($allow)
+			if ($fallback)
 			{
 				$result->set($action->name, $user->authorise($action->name, 'com_###component###'));
 			}
@@ -525,6 +564,16 @@ abstract class ###Component###Helper
 		return $result;
 	}
 	
+	public static function checkJson($string)
+	{
+		if (self::checkString($string))
+		{
+			json_decode($string);
+			return (json_last_error() === JSON_ERROR_NONE);
+		}
+		return false;
+	}
+
 	public static function checkObject($object)
 	{
 		if (isset($object) && is_object($object) && count($object) > 0)

admin/compiler/joomla_3/JControllerForm.php

@@ -264,7 +264,7 @@ class ###Component###Controller###View### extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{###POSTSAVEHOOK###
 	}
 

admin/compiler/joomla_3/JControllerForm_site.php

@@ -264,7 +264,7 @@ class ###Component###Controller###View### extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{###POSTSAVEHOOK###
 	}
 

admin/compiler/joomla_3/JControllerLegacyHelp.php

@@ -117,10 +117,10 @@ class ###Component###ControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";

admin/compiler/joomla_3/JControllerLegacyHelp_site.php

@@ -118,10 +118,10 @@ class ###Component###ControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";

admin/compiler/joomla_3/JModelAdmin.php

@@ -199,7 +199,7 @@ class ###Component###Model###View### extends JModelAdmin
 		{
 			$table->created = $date->toSql();
 			// set the user
-			if ($table->created_by == 0)
+			if ($table->created_by == 0 || empty($table->created_by))
 			{
 				$table->created_by = $user->id;
 			}

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -199,7 +199,7 @@ class ###Component###Model###View### extends JModelAdmin
 		{
 			$table->created = $date->toSql();
 			// set the user
-			if ($table->created_by == 0)
+			if ($table->created_by == 0 || empty($table->created_by))
 			{
 				$table->created_by = $user->id;
 			}

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -511,7 +511,6 @@ class ###Component###ModelImport extends JModelLegacy
 						// reset all buckets
 						$query 		= $db->getQuery(true);
 						$fields 	= array();
-						$version	= false;
 						// Fields to update.
 						foreach($row as $key => $cell)
 						{
@@ -534,7 +533,6 @@ class ###Component###ModelImport extends JModelLegacy
 							if ('version' == $target[$key])
 							{
 								$cell = (int) $version + 1;
-								$version = true;
 							}
 							// verify publish authority
 							if ('published' == $target[$key] && !$canState)
@@ -559,10 +557,6 @@ class ###Component###ModelImport extends JModelLegacy
 						// load the defaults
 						$fields[]	= $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
 						$fields[]	= $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
-						if (!$version)
-						{
-							$fields[] = $db->quoteName('version') . " = " . (int) $version + 1;
-						}
 						// Conditions for which records should be updated.
 						$conditions = array(
 							$db->quoteName('id') . ' = ' . $id

admin/compiler/joomla_3/JModelList_custom_admin.php

@@ -67,7 +67,7 @@ class ###Component###Model###SViews### extends JModelList
 		$this->levels		= $this->user->getAuthorisedViewLevels();
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
-		$this->initSet		= true;###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### ###CUSTOM_ADMIN_GET_LIST_QUERY###
+		$this->initSet		= true; ###CUSTOM_ADMIN_GET_LIST_QUERY###
 	}
 
 	/**

admin/compiler/joomla_3/JModelList_site.php

@@ -67,7 +67,7 @@ class ###Component###Model###SViews### extends JModelList
 		$this->levels		= $this->user->getAuthorisedViewLevels();
 		$this->app		= JFactory::getApplication();
 		$this->input		= $this->app->input;
-		$this->initSet		= true;###SITE_CUSTOM_BEFORE_LIST_QUERY### ###SITE_GET_LIST_QUERY###
+		$this->initSet		= true; ###SITE_GET_LIST_QUERY###
 	}
 
 	/**

admin/compiler/joomla_3/JViewLegacy_custom_admin.php

@@ -67,7 +67,7 @@ class ###Component###View###SView### extends JViewLegacy
 		// hide the main menu
 		$this->app->input->set('hidemainmenu', true);
 		// set the title
-		if ($this->item->name)
+		if (isset($this->item->name) && $this->item->name)
 		{
 			$title = $this->item->name;
 		}

admin/compiler/joomla_3/component_admin.php

@@ -46,7 +46,7 @@ $document->addStyleSheet('components/com_###component###/assets/css/admin.css');
 $document->addScript('components/com_###component###/assets/js/admin.js');
 
 // require helper files
-JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php');
+JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php'); ###HELPER_EMAIL###
 JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php');###LICENSE_LOCKED_INT### ###ADMIN_GLOBAL_EVENT###
 
 // import joomla controller library

admin/compiler/joomla_3/component_site.php

@@ -35,7 +35,7 @@ $document->addStyleSheet('components/com_###component###/assets/css/site.css');
 $document->addScript('components/com_###component###/assets/js/site.js');
 
 // Require helper files
-JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php');
+JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php'); ###HELPER_EMAIL###
 JLoader::register('###Component###HelperRoute', dirname(__FILE__) . '/helpers/route.php');###LICENSE_LOCKED_INT### ###SITE_GLOBAL_EVENT###
 
 // import joomla controller library

admin/compiler/joomla_3/default_main.php

@@ -34,7 +34,7 @@ defined('_JEXEC') or die('Restricted access');
 	<?php foreach($this->icons['main'] as $icon): ?>
         <div class="dashboard-wraper">
            <div class="dashboard-content"> 
-                <a class="icon hasTip" href="<?php echo $icon->url; ?>">
+                <a class="icon" href="<?php echo $icon->url; ?>">
                     <img alt="<?php echo $icon->alt; ?>" src="components/com_###component###/assets/images/icons/<?php  echo $icon->image; ?>">
                     <span class="dashboard-title"><?php echo JText::_($icon->name); ?></span>
                 </a>

admin/compiler/joomla_3/settings.json

@@ -225,6 +225,11 @@
           "rename": false,
           "type": "encrypt"
         },
+        "Helper_email.php": {
+          "path": "c0mp0n3nt/admin/helpers",
+          "rename": "Helper_",
+          "type": "emailer"
+        },
         "DASHJControllerAdmin.php": {
           "path": "c0mp0n3nt/admin/controllers",
           "rename": "DASHJControllerAdmin",
@@ -700,7 +705,7 @@
           "type": "template"
         },
         "layout_custom_admin.php": {
-          "path": "c0mp0n3nt/admin/layouts/VIEW",
+          "path": "c0mp0n3nt/admin/layouts",
           "rename": "layout_custom_admin",
           "type": "layout"
         }

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/config.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset
+		addrulepath="/administrator/components/com_componentbuilder/models/rules"
+		addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 		name="global_config"
 		label="COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL"
 		description="COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC">
@@ -28,7 +30,7 @@
 			name="save_history"
 			type="radio"
 			class="btn-group btn-group-yesno"
-			default="0"
+			default="1"
 			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
 			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
 			>

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@@ -70,6 +70,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'tableColumns':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$tableValue = $jinput->get('table', NULL, 'WORD');
 						if($tableValue && $user->id != 0)
 						{
@@ -83,6 +84,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -103,6 +108,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'fieldSelectOptions':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -116,6 +122,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -136,6 +146,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'layoutDetails':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', null, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -149,6 +160,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -169,6 +184,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'templateDetails':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', null, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -182,6 +198,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -202,6 +222,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'snippetDetails':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -215,6 +236,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -235,6 +260,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'dynamicValues':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$viewValue = $jinput->get('view', NULL, 'WORD');
 						if($idValue && $viewValue && $user->id != 0)
@@ -249,6 +275,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -269,6 +299,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'dynamicFormDetails':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -282,6 +313,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -302,6 +337,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'dbTableColumns':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$nameValue = $jinput->get('name', NULL, 'WORD');
 						$asValue = $jinput->get('as', NULL, 'WORD');
 						$typeValue = $jinput->get('type', NULL, 'INT');
@@ -317,6 +353,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -337,6 +377,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'viewTableColumns':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						$asValue = $jinput->get('as', NULL, 'WORD');
 						$typeValue = $jinput->get('type', NULL, 'INT');
@@ -352,6 +393,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";
@@ -372,6 +417,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 				case 'fieldOptions':
 					try
 					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
@@ -385,6 +431,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							echo $_GET['callback'] . "(".json_encode($result).");";
 						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
 						else
 						{
 							echo "(".json_encode($result).");";

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
@@ -305,7 +305,7 @@ class ComponentbuilderControllerComponent extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
@@ -349,7 +349,7 @@ class ComponentbuilderControllerField extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
@@ -349,7 +349,7 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
@@ -115,10 +115,10 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
@@ -319,7 +319,7 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy &$model, $validData = array())
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
 		return;
 	}

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.3
-	@build			30th January, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/custom/chartbuilder.php

@@ -7,8 +7,8 @@
 *
 **/
 
-// No direct access.
+// No direct access to this file
-defined('_JEXEC') or die;
+defined('_JEXEC') or die('Restricted access');
 
 class Chartbuilder
 {

admin/custom/footable2/LICENSE

@@ -0,0 +1,4 @@
+Copyright 2012 Steven Usher & Brad Vincent
+
+Released under the MIT license
+You are free to use FooTable in commercial projects as long as this copyright header is left intact.