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

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.1.2)
+# Component Builder (2.1.3)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -32,22 +32,22 @@ 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*: 19th March, 2016
++ *Last Build*: 22nd April, 2016
-+ *Version*: 2.1.2
++ *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
 
-**224 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*: **80468**
++ *Line count*: **80585**
-+ *File count*: **494**
++ *File count*: **495**
-+ *Folder count*: **97**
++ *Folder count*: **98**
 
 **148 Hours** or **19 Eight Hour Days** (the actual time the author spent)
 
@@ -57,7 +57,7 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde
 > **mapping @22hours** = codingtime / 10;
 > **office @37hours** = codingtime / 6;)
 
-**372 Hours** or **47 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**,

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

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();

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
 	**/

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/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",

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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">

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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.1.2
+	@version		2.1.3
-	@build			19th March, 2016
+	@build			22nd April, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.2
+	@version		2.1.3
-	@build			19th March, 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/footable3/LICENSE-GPLv3

@@ -0,0 +1,14 @@
+Copyright (c) 2015 Steven Usher & Brad Vincent
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.