Refactoring of the compiler continues.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.0.8)
+# Component Builder (2.1.1)
 
 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,32 +32,32 @@ 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*: 1st March, 2016
-+ *Version*: 2.0.8
++ *Version*: 2.1.1
 + *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 -
+**223 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*: **80154**
-+ *File count*: **489**
++ *File count*: **492**
-+ *Folder count*: **95**
++ *Folder count*: **97**
 
-**146 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**148 Hours** or **18 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**
+**371 Hours** or **46 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.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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

@@ -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,21 +400,21 @@ 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;
 								}
 							}
 						}
 					}
 				}
 			}
-			// if allowed then fall back on component global settings
+			// if allowed then fallback on component global settings
-			if ($allow)
+			if ($fallback)
 			{
 				$result->set($action->name, $user->authorise($action->name, 'com_###component###'));
 			}

admin/compiler/joomla_3/Helper_site.php

@@ -355,7 +355,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 +371,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 +387,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 +403,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 +419,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 +455,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 +471,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 +487,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,21 +503,21 @@ 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;
 								}
 							}
 						}
 					}
 				}
 			}
-			// if allowed then fall back on component global settings
+			// if allowed then fallback on component global settings
-			if ($allow)
+			if ($fallback)
 			{
 				$result->set($action->name, $user->authorise($action->name, 'com_###component###'));
 			}

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

@@ -700,7 +700,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.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/config.xml

@@ -466,24 +466,6 @@
 			filter="PATH"
 			message="Error! Please add folder path here."
 			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_HINT"
-		/>		
-		<!-- Note_git_folder_path Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_git_folder_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_git_folder_path" />		
-		<!-- Git_folder_path Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="git_folder_path"
-			label="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL"
-			size="70"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION"
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="false"
-			filter="PATH"
-			message="Error! Please add folder path here."
-			hint="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT"
 		/>
 	</fieldset>
 	<fieldset

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 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.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/custom/importViews/index.html

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

admin/custom/importViews/tmpl/index.html

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

admin/helpers/compiler/index.html

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

admin/helpers/compiler/infusion.php

@@ -0,0 +1,993 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.0.8
+	@build			30th January, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		compiler.php
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Interpretation class
+ */
+class Infusion extends Interpretation
+{
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($config = array ())
+	{
+		// first we run the perent constructor
+		if (parent::__construct($config))
+		{
+			// infuse the data into the structure
+			return $this->buildFileContent();		
+		}
+		return false;
+	}
+	
+	/*
+	 * Build the content for the structure
+	 * 
+	 *
+	 * @return  boolean  on success
+	 * 
+	 */
+	protected function buildFileContent()
+	{
+		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
+		{
+			// ###COMPONENT###
+			$this->fileContentStatic['###COMPONENT###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
+
+			// ###Component###
+			$this->fileContentStatic['###Component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'F');
+
+			// ###component###
+			$this->fileContentStatic['###component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code);
+
+			// ###COMPANYNAME###
+			$this->fileContentStatic['###COMPANYNAME###'] = trim($this->componentData->companyname);
+			
+			// ###CREATIONDATE###
+			$this->fileContentStatic['###CREATIONDATE###'] = JFactory::getDate($this->componentData->created)->format('jS F, Y');
+			
+			// ###BUILDDATE###
+			$this->fileContentStatic['###BUILDDATE###'] = JFactory::getDate()->format('jS F, Y');
+			
+			// ###AUTHOR###
+			$this->fileContentStatic['###AUTHOR###'] = trim($this->componentData->author);
+
+			// ###AUTHOREMAIL###
+			$this->fileContentStatic['###AUTHOREMAIL###'] = trim($this->componentData->email);
+
+			// ###AUTHORWEBSITE###
+			$this->fileContentStatic['###AUTHORWEBSITE###'] = trim($this->componentData->website);
+
+			// ###COPYRIGHT###
+			$this->fileContentStatic['###COPYRIGHT###'] = trim($this->componentData->copyright);
+
+			// ###LICENSE###
+			$this->fileContentStatic['###LICENSE###'] = trim($this->componentData->license);
+
+			// ###VERSION###
+			$this->fileContentStatic['###VERSION###'] = trim($this->componentData->component_version);
+
+			// ###Component_name###
+			$this->fileContentStatic['###Component_name###'] = ComponentbuilderHelper::safeString($this->componentData->name,'W');
+
+			// ###SHORT_DISCRIPTION###
+			$this->fileContentStatic['###SHORT_DESCRIPTION###'] = trim($this->componentData->short_description);
+
+			// ###DESCRIPTION###
+			$this->fileContentStatic['###DESCRIPTION###'] = trim($this->componentData->description);
+
+			// ###COMP_IMAGE_TYPE###
+			$this->fileContentStatic['###COMP_IMAGE_TYPE###'] = $this->setComponentImageType($this->componentData->image);
+
+			// ###ACCESS_SECTIONS###
+			$this->fileContentStatic['###ACCESS_SECTIONS###'] = $this->setAccessSections();
+
+			// set component place holders
+			$this->placeholders = array(
+				'###Component###'		=> $this->fileContentStatic['###Component###'],
+				'###component###'		=> $this->fileContentStatic['###component###'],
+				'###COMPONENT###'		=> $this->fileContentStatic['###COMPONENT###'],
+				'[[[Component]]]'		=> $this->fileContentStatic['###Component###'],
+				'[[[component]]]'		=> $this->fileContentStatic['###component###'],
+				'[[[COMPONENT]]]'		=> $this->fileContentStatic['###COMPONENT###']
+				);
+			
+			// ###CONFIG_FIELDSETS###
+			$keepLang = $this->lang;
+			$this->lang = 'admin';
+			// run the field sets for first time
+			$this->setConfigFieldsets(1);
+			$this->lang = $keepLang;
+			
+			// ###ADMINCSS###
+			$this->fileContentStatic['###ADMINCSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+			// ###SITECSS###
+			$this->fileContentStatic['###SITECSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+
+			// ###CUSTOM_HELPER_SCRIPT###
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_admin']);
+			
+			// ###ADMIN_GLOBAL_EVENT_HELPER###
+			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
+			
+			// ###ADMIN_GLOBAL_EVENT###
+			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = '';
+			// now load the data for the global event if needed
+			if ($this->componentData->add_admin_event == 1)
+			{
+				// ###ADMIN_GLOBAL_EVENT###
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Admin Event';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+				// ###ADMIN_GLOBAL_EVENT_HELPER###
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Admin Event Method.';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_admin_event']);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+			}
+			
+			// ###HELPER_CREATEUSER###
+			$this->fileContentStatic['###HELPER_CREATEUSER###'] = $this->setCreateUserHelperMethod($this->componentData->creatuserhelper);
+
+			// ###HELP###
+			$this->fileContentStatic['###HELP###'] = $this->noHelp();
+			// ###HELP_SITE###
+			$this->fileContentStatic['###HELP_SITE###'] = $this->noHelp();
+			// ###UPDATE_VERSION_MYSQL###
+			$this->setVersionController();
+
+			// build route parse switch
+			$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] = '';
+			// build route views
+			$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '';
+
+			// setup back-views and all needed stuff for the admin
+			if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
+			{
+				// reset view array
+				$viewarray = array();
+				$site_edit_view_array = array();
+				// start dynamic build
+				foreach ($this->componentData->admin_views as $view)
+				{
+					$this->lang = 'admin';
+					// set main keys
+					$viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single);
+					$viewName_list = ComponentbuilderHelper::safeString($view['settings']->name_list);
+					// set site edit view array
+					if ($view['edit_create_site_view'])
+					{
+						$site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'";
+						$this->lang = 'both';
+					}
+					// set the export/import option
+					if ($view['port'])
+					{
+						$this->eximportView[$viewName_list] = true;
+					}
+					else
+					{
+						$this->eximportView[$viewName_list] = false;
+					}
+					// check if help is being loaded
+					$this->checkHelp($viewName_single);
+					// set custom admin view list links
+					$this->setCustomAdminViewListLink($view,$viewName_list);
+					
+					// set view array
+					$viewarray[] = "\t\t\t\t'".$viewName_single."' => '".$viewName_list."'";
+					// set the view names
+					if ($view['settings']->name_single != 'null')
+					{
+						// ###VIEW### <<<DYNAMIC>>>
+						$viewName_u = ComponentbuilderHelper::safeString($view['settings']->name_single,'U');
+						$this->fileContentDynamic[$viewName_single]['###VIEW###'] = $viewName_u;
+						$this->fileContentDynamic[$viewName_list]['###VIEW###'] = $viewName_u;
+
+						// ###View### <<<DYNAMIC>>>
+						$viewName_f = ComponentbuilderHelper::safeString($view['settings']->name_single,'F');
+						$this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f;
+						$this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f;
+
+						// ###view### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###view###'] = $viewName_single;
+						$this->fileContentDynamic[$viewName_list]['###view###'] = $viewName_single;
+
+						// set some place holder for the views
+						$this->placeholders['###view###'] = $viewName_single;
+						
+						// set license per view if needed
+						$this->setLockLicensePer($viewName_single);
+						$this->setLockLicensePer($viewName_list);
+
+						// ###FIELDSETS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
+
+						// ###ACCESSCONTROL### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single);
+
+						// ###LINKEDVIEWITEMS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] = '';
+
+						// ###ADDTOOLBAR### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###ADDTOOLBAR###'] = $this->setAddToolBar($view);
+
+						// set the script for this view
+						$this->buildTheViewScript($view, $this->fileContentStatic['###component###']);
+
+						// ###VIEW_SCRIPT###
+						$this->fileContentDynamic[$viewName_single]['###VIEW_SCRIPT###'] = $this->setViewScript($viewName_single);
+
+						// ###EDITBODYSCRIPT###
+						$this->fileContentDynamic[$viewName_single]['###EDITBODYSCRIPT###'] = $this->setEditBodyScript($viewName_single);
+
+						// ###AJAXTOKE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single);
+
+						// ###LINKEDVIEWTABLESCRIPTS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = '';
+
+						// ###VALIDATEFIX### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
+
+						// ###EDITBODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
+
+						// ###JTABLECONSTRUCTOR### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###JTABLECONSTRUCTOR###'] = $this->setJtableConstructor($viewName_single);
+
+						// ###JTABLEALIASCATEGORY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###JTABLEALIASCATEGORY###'] = $this->setJtableAliasCategory($viewName_single);
+
+						// ###METHOD_GET_ITEM### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###METHOD_GET_ITEM###'] = $this->setMethodGetItem($viewName_single);
+
+						// ###LINKEDVIEWGLOBAL### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] = '';
+
+						// ###LINKEDVIEWMETHODS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
+
+						// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->setJmodelAdminBeforeDelete($viewName_single);
+
+						// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->setJmodelAdminAfterDelete($viewName_single);
+
+						// ###CHECKBOX_SAVE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
+
+						// ###METHOD_ITEM_SAVE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
+
+						// ###POSTSAVEHOOK### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->setPostSaveHook($viewName_single);
+
+						if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
+						{
+							// ###VIEWCSS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
+								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_view'][$viewName_single]);
+							// clear some memory
+							unset($this->customScriptBuilder['css_view'][$viewName_single]);
+						}
+						else
+						{
+							// ###VIEWCSS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] = '';
+						}
+						// add css to front end
+						if ($view['edit_create_site_view'])
+						{
+							$this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
+						}
+					}
+					// set the views names
+					if ($view['settings']->name_list != 'null')
+					{
+						$this->lang = 'admin';
+						// ###VIEWS### <<<DYNAMIC>>>
+						$viewsName_u = ComponentbuilderHelper::safeString($view['settings']->name_list,'U');
+						$this->fileContentDynamic[$viewName_list]['###VIEWS###'] = $viewsName_u;
+						$this->fileContentDynamic[$viewName_single]['###VIEWS###'] = $viewsName_u;
+
+						// ###Views### <<<DYNAMIC>>>
+						$viewsName_f = ComponentbuilderHelper::safeString($view['settings']->name_list,'F');
+						$this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f;
+						$this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f;
+
+						// ###views### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###views###'] = $viewName_list;
+						$this->fileContentDynamic[$viewName_single]['###views###'] = $viewName_list;
+						// ###ICOMOON### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###ICOMOON###'] = $view['icomoon'];
+
+						// set some place holder for the views
+						$this->placeholders['###views###'] = $viewName_list;
+
+						// set Autocheckin function
+						if ($view['checkin'] == 1)
+						{
+							// ###AUTOCHECKIN### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']);
+							// ###CHECKINCALL### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall();
+						}
+						else
+						{
+							// ###AUTOCHECKIN### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = '';
+							// ###CHECKINCALL### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = '';
+						}
+
+						// ###STORE_METHOD_FIX### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
+
+						// ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
+
+						// ###SELECTIONTRANSLATIONFIXFUNC### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']);
+
+						// ###FILTER_FIELDS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list);
+
+						// ###STOREDID### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###STOREDID###'] = $this->setStoredId($viewName_list);
+
+						// ###POPULATESTATE### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###POPULATESTATE###'] = $this->setPopulateState($viewName_list);
+
+						// ###SORTFIELDS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###SORTFIELDS###'] = $this->setSortFields($viewName_list);
+
+						// ###CATEGORYFILTER### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###CATEGORYFILTER###'] = $this->setCategoryFilter($viewName_list);
+
+						// ###CATEGORY_VIEWS###
+						if (!isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']))
+						{
+							$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = '';
+						}
+						$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single,$viewName_list);
+
+						// ###OTHERFILTERS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list);
+
+						// ###FILTERFUNCTIONS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single,$viewName_list);
+
+						// ###LISTQUERY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single,$viewName_list);
+
+						// ###MODELEXPORTMETHOD### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list);
+
+						// ###MODELEXIMPORTMETHOD### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list);
+
+						// ###EXPORTBUTTON### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list);
+
+						// ###IMPORTBUTTON### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list);
+
+						// ###LISTHEAD### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single,$viewName_list);
+
+						// ###LISTBODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###LISTBODY###'] = $this->setListBody($viewName_single,$viewName_list);
+
+						// ###LISTCOLNR### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list);
+
+						// ###JVIEWLISTCANDO### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single,$viewName_list);
+						
+						if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
+						{
+							// ###VIEWCSS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
+								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_views'][$viewName_list]);
+							// clear some memory
+							unset($this->customScriptBuilder['css_views'][$viewName_list]);
+						}
+						else
+						{
+							// ###VIEWCSS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = '';
+						}
+					}
+
+					// set u fields used in batch
+					$this->fileContentDynamic[$viewName_single]['###UNIQUEFIELDS###'] = $this->setUniqueFields($viewName_single);
+
+					// ###TITLEALIASFIX### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###TITLEALIASFIX###'] = $this->setAliasTitleFix($viewName_single);
+
+					// ###GENERATENEWTITLE### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###GENERATENEWTITLE###'] = $this->setGenerateNewTitle($viewName_single);
+
+					// ###MODEL_BATCH_COPY### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_COPY###'] = $this->setBatchCopy($viewName_single);
+
+					// ###MODEL_BATCH_MOVE### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_MOVE###'] = $this->setBatchMove($viewName_single);
+
+					// ###JCONTROLLERFORM_ALLOWADD### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);
+
+					// ###JCONTROLLERFORM_ALLOWEDIT### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single,$viewName_list);
+
+					// ###JMODELADMIN_GETFORM### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single,$viewName_list);
+
+					// ###JMODELADMIN_ALLOWEDIT### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list);
+
+					// ###JMODELADMIN_CANDELETE### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single,$viewName_list);
+
+					// ###JMODELADMIN_CANEDITSTATE### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single,$viewName_list);
+					
+					// set custom admin view Toolbare buttons
+					// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS###  <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list);
+					// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###  <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list);
+
+					// set helper router
+					if (!isset($this->fileContentStatic['###ROUTEHELPER###']))
+					{
+						$this->fileContentStatic['###ROUTEHELPER###'] = '';
+					}
+					$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($viewName_single, $viewName_list);
+					
+					if ($view['edit_create_site_view'])
+					{
+						// add needed router stuff for front edit views
+						$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single);
+						$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single);
+					}
+
+					// ###ACCESS_SECTIONS###
+					if (!isset($this->fileContentStatic['###ACCESS_SECTIONS###']))
+					{
+						$this->fileContentStatic['###ACCESS_SECTIONS###'] = '';
+					}
+					$this->fileContentStatic['###ACCESS_SECTIONS###'] .= $this->setAccessSectionsCategory($viewName_single, $viewName_list);
+
+					// ###HELPER_EXEL###
+					$this->fileContentStatic['###HELPER_EXEL###'] = $this->setExelHelperMethods();
+
+				}
+
+				// setup custom_admin_views and all needed stuff for the site
+				if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views))
+				{
+					$this->target		= 'custom_admin';
+					$this->lang		= 'admin';
+					// var_dump($this->componentData->custom_admin_views);exit;
+					// start dynamic build
+					foreach ($this->componentData->custom_admin_views as $view)
+					{
+						// for single views
+						$this->fileContentDynamic[$view['settings']->code]['###SView###'] = $view['settings']->Code;
+						$this->fileContentDynamic[$view['settings']->code]['###sview###'] = $view['settings']->code;
+						$this->fileContentDynamic[$view['settings']->code]['###SVIEW###'] = $view['settings']->CODE;
+						// for list views
+						$this->fileContentDynamic[$view['settings']->code]['###SViews###'] = $view['settings']->Code;
+						$this->fileContentDynamic[$view['settings']->code]['###sviews###'] = $view['settings']->code;
+						$this->fileContentDynamic[$view['settings']->code]['###SVIEWS###'] = $view['settings']->CODE;
+						// add to lang array
+						if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE]))
+						{
+							$this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name;
+						}
+						if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
+						{
+							$this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description;
+						}
+						// ###ICOMOON### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon'];
+						
+						// set placeholders
+						$this->placeholders['###SView###'] = $view['settings']->Code;
+						$this->placeholders['###sview###'] = $view['settings']->code;
+						$this->placeholders['###SVIEW###'] = $view['settings']->CODE;
+						$this->placeholders['[[[SView]]]'] = $view['settings']->Code;
+						$this->placeholders['[[[sview]]]'] = $view['settings']->code;
+						$this->placeholders['[[[SVIEW]]]'] = $view['settings']->CODE;
+						$this->placeholders['###SViews###'] = $view['settings']->Code;
+						$this->placeholders['###sviews###'] = $view['settings']->code;
+						$this->placeholders['###SVIEWS###'] = $view['settings']->CODE;
+						$this->placeholders['[[[SViews]]]'] = $view['settings']->Code;
+						$this->placeholders['[[[sviews]]]'] = $view['settings']->code;
+						$this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE;
+						
+						// set license per view if needed
+						$this->setLockLicensePer($view['settings']->code);
+						
+						if ($view['settings']->main_get->gettype == 1)
+						{
+							// check if there is any custom script
+							if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
+							{
+								// ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
+									= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+								// clear some memory
+								unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+							}
+							else
+							{
+								// ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] = '';
+							}
+
+							// ###CUSTOM_ADMIN_GET_ITEM### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
+
+							// check if there is any custom script
+							if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
+							{
+								// ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
+									= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+								// clear some memory
+								unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+							}
+							else
+							{
+								// ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] = '';
+							}
+						}
+						elseif ($view['settings']->main_get->gettype == 2)
+						{
+							// ###CUSTOM_ADMIN_GET_LIST_QUERY### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
+							
+							// check if there is any custom script
+							if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
+							{
+								// ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
+									= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+								// clear some memory
+								unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+							}
+							else
+							{
+								// ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] = '';
+							}
+
+							// check if there is any custom script
+							if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
+							{
+								// ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
+									= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+								// clear some memory
+								unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+							}
+							else
+							{
+								// ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] = '';
+							}
+
+							// ###CUSTOM_ADMIN_GET_ITEMS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
+
+							// check if there is any custom script
+							if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
+							{
+								// ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
+									= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+								// clear some memory
+								unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+							}
+							else
+							{
+								// ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
+								$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] = '';
+							}
+						}
+
+						// ###CUSTOM_ADMIN_CUSTOM_METHODS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
+						// ###CUSTOM_ADMIN_DIPLAY_METHOD### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
+						// set document details
+						$this->setPrepareDocument($view);
+						// ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
+						// ###CUSTOM_ADMIN_CODE_BODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
+						// ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
+
+						// setup the templates
+						$this->setCustomViewTemplateBody($view);
+					}
+
+					// setup the layouts
+					$this->setCustomViewLayouts();
+				}
+
+				// ###VIEWARRAY###
+				$this->fileContentStatic['###VIEWARRAY###'] = "\n".implode(",\n",$viewarray);
+				
+				// ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY###
+				$this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = "\n".implode(",\n",$site_edit_view_array);
+
+				// ###MAINMENUS###
+				$this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus();
+
+				// ###SUBMENU###
+				$this->fileContentStatic['###SUBMENU###'] = $this->setSubMenus();
+
+				// ###GET_CRYPT_KEY###
+				$this->fileContentStatic['###GET_CRYPT_KEY###'] = $this->setGetCryptKey();
+				
+				// set the license locker
+				$this->setLockLicense();
+
+				// ###CONTRIBUTORS###
+				$this->fileContentStatic['###CONTRIBUTORS###'] = $this->theContributors;
+
+				// ###INSTALL###
+				$this->fileContentStatic['###INSTALL###'] = $this->setInstall();
+
+				// ###UNINSTALL###
+				$this->fileContentStatic['###UNINSTALL###'] = $this->setUninstall();
+
+				// ###DASHBOARDICONS###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons();
+
+				// ###DASHBOARDICONACCESS###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONACCESS###'] = $this->setDashboardIconAccess();
+
+				// ###DASH_MODEL_METHODS###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_MODEL_METHODS###'] = $this->setDashboardModelMethods();
+
+				// ###DASH_GET_CUSTOM_DATA###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_GET_CUSTOM_DATA###'] = $this->setDashboardGetCustomData();
+
+				// ###DASH_DISPLAY_DATA###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData();
+				
+				// add import
+				if (isset($this->addEximport) && $this->addEximport)
+				{
+					// setup import files
+					$target = array('admin' => 'import');
+					$this->buildDynamique($target,'import');
+					// set the controller
+					$this->fileContentDynamic['import']['###BLABLABLA###'] = '';
+				}
+
+				// ensure that the ajax model and controller is set if needed
+				if (isset($this->addAjax) && $this->addAjax)
+				{
+					// setup Ajax files
+					$target = array('admin' => 'ajax');
+					$this->buildDynamique($target,'ajax');
+					// set the controller
+					$this->fileContentDynamic['ajax']['###REGISTER_AJAX_TASK###'] = $this->setRegisterAjaxTask('admin');
+					$this->fileContentDynamic['ajax']['###AJAX_INPUT_RETURN###'] = $this->setAjaxInputReturn('admin');
+					// set the module
+					$this->fileContentDynamic['ajax']['###AJAX_MODEL_METHODS###'] = $this->setAjaxModelMethods('admin');
+				}
+
+				// ensure that the site ajax model and controller is set if needed
+				if (isset($this->addSiteAjax) && $this->addSiteAjax)
+				{
+					// setup Ajax files
+					$target = array('site' => 'ajax');
+					$this->buildDynamique($target,'ajax');
+					// set the controller
+					$this->fileContentDynamic['ajax']['###REGISTER_SITE_AJAX_TASK###'] = $this->setRegisterAjaxTask('site' );
+					$this->fileContentDynamic['ajax']['###AJAX_SITE_INPUT_RETURN###'] = $this->setAjaxInputReturn('site' );
+					// set the module
+					$this->fileContentDynamic['ajax']['###AJAX_SITE_MODEL_METHODS###'] = $this->setAjaxModelMethods('site');
+				}
+
+				// run the second run if needed
+				if (isset($this->secondRunAdmin) && ComponentbuilderHelper::checkArray($this->secondRunAdmin))
+				{
+					// start dynamic build
+					foreach ($this->secondRunAdmin as $function => $arrays)
+					{
+						if (ComponentbuilderHelper::checkArray($arrays) && ComponentbuilderHelper::checkString($function))
+						{
+							foreach ($arrays as $array)
+							{
+								$this->{$function}($array);
+							}
+						}
+					}
+
+				}
+					
+				// ###CONFIG_FIELDSETS###
+				$keepLang = $this->lang;
+				$this->lang = 'admin';
+				// run field sets for second time
+				$this->setConfigFieldsets(2);
+				$this->lang = $keepLang;
+			}
+			
+			// setup front-views and all needed stuff for the site
+			if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views))
+			{
+				$this->target = 'site';
+				// var_dump($this->componentData->site_views);exit;
+				// start dynamic build
+				foreach ($this->componentData->site_views as $view)
+				{
+					// for list views
+					$this->fileContentDynamic[$view['settings']->code]['###SViews###'] = $view['settings']->Code;
+					$this->fileContentDynamic[$view['settings']->code]['###sviews###'] = $view['settings']->code;
+					// for single views
+					$this->fileContentDynamic[$view['settings']->code]['###SView###'] = $view['settings']->Code;
+					$this->fileContentDynamic[$view['settings']->code]['###sview###'] = $view['settings']->code;
+
+					// set placeholder
+					$this->placeholders['###SView###'] = $view['settings']->Code;
+					$this->placeholders['###sview###'] = $view['settings']->code;
+					$this->placeholders['###SVIEW###'] = $view['settings']->CODE;
+					$this->placeholders['[[[SView]]]'] = $view['settings']->Code;
+					$this->placeholders['[[[sview]]]'] = $view['settings']->code;
+					$this->placeholders['[[[SVIEW]]]'] = $view['settings']->CODE;
+					$this->placeholders['###SViews###'] = $view['settings']->Code;
+					$this->placeholders['###sviews###'] = $view['settings']->code;
+					$this->placeholders['###SVIEWS###'] = $view['settings']->CODE;
+					$this->placeholders['[[[SViews]]]'] = $view['settings']->Code;
+					$this->placeholders['[[[sviews]]]'] = $view['settings']->code;
+					$this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE;
+						
+					// set license per view if needed
+					$this->setLockLicensePer($view['settings']->code);
+					
+					// set the site default view
+					if ($view['default_view'] == 1)
+					{
+						$this->fileContentStatic['###SITE_DEFAULT_VIEW###'] = $view['settings']->code;
+					}
+					// add site menu
+					if ($view['menu'] == 1)
+					{
+						// ###SITE_MENU_XML### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_MENU_XML###'] = $this->setCustomViewMenu($view);
+					}
+					
+					// insure the needed route helper is loaded
+					$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
+					// build route details 
+					$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code);
+					$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
+					
+					if ($view['settings']->main_get->gettype == 1)
+					{
+						// check if there is any custom script
+						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
+						{
+							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
+								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+							// clear some memory
+							unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+						}
+						else
+						{
+							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###'] = '';
+						}
+
+						// ###SITE_GET_ITEM### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
+
+						// check if there is any custom script
+						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
+						{
+							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
+								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+							// clear some memory
+							unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+						}
+						else
+						{
+							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###'] = '';
+						}
+					}
+					elseif ($view['settings']->main_get->gettype == 2)
+					{						
+						// ###SITE_GET_LIST_QUERY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
+
+						// check if there is any custom script
+						if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
+						{
+							// ###SITE_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_BEFORE_LIST_QUERY###']
+								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+							// clear some memory
+							unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+						}
+						else
+						{
+							// ###SITE_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_BEFORE_LIST_QUERY###'] = '';
+						}
+
+						// check if there is any custom script
+						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
+						{
+							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
+								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+							// clear some memory
+							unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+						}
+						else
+						{
+							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###'] = '';
+						}
+						
+						// ###SITE_GET_ITEMS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
+						
+						// check if there is any custom script
+						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
+						{
+							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
+								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+							// clear some memory
+							unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+						}
+						else
+						{
+							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###'] = '';
+						}
+					}
+					// add to lang array
+					if (!isset($this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE]))
+					{
+						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name;
+					}
+					if (!isset($this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC']))
+					{
+						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description;
+					}
+					// ###SITE_CUSTOM_METHODS### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
+					// ###SITE_DIPLAY_METHOD### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
+					// set document details
+					$this->setPrepareDocument($view);
+					// ###SITE_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
+					// ###SITE_CODE_BODY### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
+					// ###SITE_BODY### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_BODY###'] = $this->setCustomViewBody($view);
+
+					// setup the templates
+					$this->setCustomViewTemplateBody($view);
+				}
+				// set site custom script to helper class
+				// ###SITE_CUSTOM_HELPER_SCRIPT###
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_site']);
+				// ###SITE_GLOBAL_EVENT_HELPER###
+				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
+				// ###SITE_GLOBAL_EVENT###
+				$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = '';
+				// now load the data for the global event if needed
+				if ($this->componentData->add_site_event == 1)
+				{
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Site Event';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+					// ###SITE_GLOBAL_EVENT_HELPER###
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Site Event Method.';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_site_event']);
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+				}
+				// setup the layouts
+				$this->setCustomViewLayouts();
+			}
+			
+			// ###LANG_ADMIN###
+			$this->fileContentStatic['###LANG_ADMIN###'] = $this->setLangAdmin();
+
+			// ###LANG_ADMIN_SYS###
+			$this->fileContentStatic['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
+			
+			// ###LANG_SITE###
+			$this->fileContentStatic['###LANG_SITE###'] = $this->setLangSite();
+			
+			// ###LANG_SITE_SYS###
+			$this->fileContentStatic['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
+
+			// ###INSTALLSCRIPT###
+			$this->fileContentStatic['###INSTALLSCRIPT###'] = $this->setInstallScript();
+
+			// ###UPDATESCRIPT###
+			$this->fileContentStatic['###UPDATESCRIPT###'] = $this->setUpdateScript();
+
+			// ###UNINSTALLSCRIPT###
+			$this->fileContentStatic['###UNINSTALLSCRIPT###'] = $this->setUninstallScript();
+			
+			// ###HELPER_UIKIT###
+			$this->fileContentStatic['###HELPER_UIKIT###'] = $this->setUikitHelperMethods();
+			
+			// ###CONFIG_FIELDSETS###
+			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode("\n",$this->configFieldSets);
+			
+			// check if this has been set
+			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
+			{
+				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = 0;
+			}
+			else
+			{
+				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '('.$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'].')';
+			}
+			
+			// ###README###
+			if ($this->componentData->addreadme)
+			{
+				$this->fileContentStatic['###README###'] = $this->componentData->readme;
+			}
+			return true;
+		}
+		return false;
+	}
+
+}

admin/helpers/compiler/structure.php

@@ -0,0 +1,813 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.0.8
+	@build			30th January, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		compiler.php
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Structure class
+ */
+class Structure extends Get
+{		
+	/*
+	 * The foulder counter
+	 * 
+	 * @var     int
+	 */
+	public $folderCount = 0;
+	
+	/*
+	 * The foulder counter
+	 * 
+	 * @var     int
+	 */
+	public $fileCount = 0;
+	
+	/*
+	 * The line counter
+	 * 
+	 * @var     int
+	 */
+	public $lineCount = 0;
+	
+	/*
+	 * The Joomla Version
+	 * 
+	 * @var     string
+	 */
+	public $joomlaVersion;
+	
+	/*
+	 * The template path
+	 * 
+	 * @var     string
+	 */
+	public $templatePath;
+	
+	/*
+	 * The custom template path
+	 * 
+	 * @var     string
+	 */
+	public $templatePathCustom;
+	
+	/*
+	 * The Joomla Version Data
+	 * 
+	 * @var      object
+	 */
+	public $joomlaVersionData;
+	
+	/*
+	 * Static File Content
+	 * 
+	 * @var      array
+	 */
+	public $fileContentStatic = array();
+	
+	/*
+	 * Dynamic File Content
+	 * 
+	 * @var      array
+	 */
+	public $fileContentDynamic = array();
+	
+	/*
+	 * The Component Sales name
+	 * 
+	 * @var      string
+	 */
+	public $componentSalesName;
+	
+	/*
+	 * The Component Backup name
+	 * 
+	 * @var      string
+	 */
+	public $componentBackupName;
+	
+	/*
+	 * The Component Folder name
+	 * 
+	 * @var      string
+	 */
+	public $componentFolderName;
+	
+	/*
+	 * The Component path
+	 * 
+	 * @var      string
+	 */
+	public $componentPath;
+	
+	/*
+	 * The not new static items
+	 * 
+	 * @var      array
+	 */
+	public $notNew = array();
+	
+	/*
+	 * The new files
+	 * 
+	 * @var     array
+	 */
+	public $newFiles = array();
+	
+	/*
+	 * The Checkin Switch
+	 * 
+	 * @var     boolean
+	 */
+	public $addCheckin = false;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($config = array ())
+	{
+		// first we run the perent constructor
+		if (parent::__construct($config))
+		{			
+			// set the Joomla version
+			$this->joomlaVersion		= $config['joomlaVersion'];
+			// set the template path
+			$this->templatePath		= $this->compilerPath.'/joomla_'.$config['joomlaVersion'];
+			// set some default names
+			$this->componentSalesName	= 'com_'.$this->componentData->sales_name.'__J'.$this->joomlaVersion;
+			$this->componentBackupName	= 'com_'.$this->componentData->sales_name.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion;
+			$this->componentFolderName	= 'com_'.$this->componentData->name_code.'_v'.str_replace('.','_',$this->componentData->component_version).'__J'.$this->joomlaVersion;
+			// set component folder path
+			$this->componentPath		= $this->compilerPath.'/'.$this->componentFolderName;
+			// set the template path for custom
+			$this->templatePathCustom	= $this->params->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
+			// set the Joomla Version Data
+			$this->joomlaVersionData	= $this->setJoomlaVersionData();
+			// make sure there is no old build
+			$this->removeFolder($this->componentPath);
+			// set the new folders
+			if (!$this->setFolders())
+			{
+				return false;
+			}
+			// set all static folders and files
+			if (!$this->setStatic())
+			{
+				return false;
+			}
+			// set all the dynamic folders and files
+			if (!$this->setDynamique())
+			{
+				return false;
+			}
+			
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * Build the Initial Folders
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setFolders()
+	{
+		if (ComponentbuilderHelper::checkObject($this->joomlaVersionData->create))
+		{
+			// creat the main componet folder
+			if (!JFolder::exists($this->componentPath))
+			{
+				JFolder::create($this->componentPath);
+				// count the folder created
+				$this->folderCount++;
+				$this->indexHTML('');
+			}
+			// now build all folders needed for this component
+			foreach ($this->joomlaVersionData->create as $main => $folders)
+			{
+				if (!JFolder::exists($this->componentPath.'/'.$main))
+				{
+					JFolder::create($this->componentPath.'/'.$main);
+					// count the folder created
+					$this->folderCount++;
+					$this->indexHTML($main);
+				}
+				if (ComponentbuilderHelper::checkObject($folders))
+				{
+					foreach ($folders as $sub => $subFolders)
+					{
+						if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub))
+						{
+							JFolder::create($this->componentPath.'/'.$main.'/'.$sub);
+							// count the folder created
+							$this->folderCount++;
+							$this->indexHTML($main.'/'.$sub);
+						}
+						if (ComponentbuilderHelper::checkObject($subFolders))
+						{
+							foreach ($subFolders as $sub_2 => $subFolders_2)
+							{
+								if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2))
+								{
+									JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2);
+									// count the folder created
+									$this->folderCount++;
+									$this->indexHTML($main.'/'.$sub.'/'.$sub_2);
+								}
+								if (ComponentbuilderHelper::checkObject($subFolders_2))
+								{
+									foreach ($subFolders_2 as $sub_3 => $subFolders_3)
+									{
+
+										if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3))
+										{
+											JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3);
+											// count the folder created
+											$this->folderCount++;
+											$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3);
+										}
+										if (ComponentbuilderHelper::checkObject($subFolders_3))
+										{
+											foreach ($subFolders_3 as $sub_4 => $subFolders_4)
+											{
+												if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4))
+												{
+													JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4);
+													// count the folder created
+													$this->folderCount++;
+													$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4);
+												}
+												if (ComponentbuilderHelper::checkObject($subFolders_4))
+												{
+													foreach ($subFolders_4 as $sub_5 => $subFolders_5)
+													{
+														if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5))
+														{
+															JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5);
+															// count the folder created
+															$this->folderCount++;
+															$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5);
+														}
+														if (ComponentbuilderHelper::checkObject($subFolders_5))
+														{
+															foreach ($subFolders_5 as $sub_6 => $subFolders_6)
+															{
+																if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6))
+																{
+																	JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6);
+																	// count the folder created
+																	$this->folderCount++;
+																	$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6);
+																}
+																if (ComponentbuilderHelper::checkObject($subFolders_6))
+																{
+																	foreach ($subFolders_6 as $sub_7 => $subFolders_7)
+																	{
+																		if (!JFolder::exists($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7))
+																		{
+																			JFolder::create($this->componentPath.'/'.$main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7);
+																			// count the folder created
+																			$this->folderCount++;
+																			$this->indexHTML($main.'/'.$sub.'/'.$sub_2.'/'.$sub_3.'/'.$sub_4.'/'.$sub_5.'/'.$sub_6.'/'.$sub_7);
+																		}
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * Set the Static File & Folder
+	 *  
+	 * @return  boolean
+	 * 
+	 */
+	private function setStatic()
+	{
+		if (ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->static))
+		{
+			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			// TODO needs more looking at this must be dynamic actualy
+			$this->notNew[] = 'PHPExcel.php';
+			$this->notNew[] = 'LICENSE.txt';
+			// do license check
+			$LICENSE = false;
+			$licenseChecker = strtolower($this->componentData->license);
+			if (strpos($licenseChecker,'gnu') !== false && strpos($licenseChecker,'gpl') !== false)
+			{
+				$LICENSE = true;
+			}
+			// do README check
+			$README = false;			
+			// add the README file if needed
+			if ($this->componentData->addreadme)
+			{
+				$README = true;
+			}
+			// start moving
+			foreach ($this->joomlaVersionData->move->static as $ftem => $details)
+			{
+				// set item
+				$item = $details->naam;
+				// do the file renaming
+				if ($details->rename)
+				{
+					if ($details->rename == 'new')
+					{
+						$new = $details->newName;
+					}
+					else
+					{
+						$new = str_replace($details->rename, $codeName, $item);
+					}
+				}
+				else
+				{
+					$new = $item;
+				}
+				// if not gnu/gpl license dont add the LICENSE.txt file
+				if ($item == 'LICENSE.txt' && !$LICENSE)
+				{
+					continue;
+				}
+				// if not needed do not add
+				if ($item == 'README.md' && !$README)
+				{
+					continue;
+				}
+				// set destination path
+				$zipPath	= str_replace('c0mp0n3nt/','', $details->path);
+				$path		= str_replace('c0mp0n3nt/',$this->componentPath.'/', $details->path);
+				// set the template folder path
+				$templatePath = (isset($details->custom) && $details->custom) ? $this->templatePathCustom : $this->templatePath;
+				// now mov the file
+				if ($details->type == 'file')
+				{
+					// move the file to its place
+					JFile::copy($templatePath.'/'.$item, $path.'/'.$new);
+					// count the file created
+					$this->fileCount++;
+					// store the new files
+					if (!in_array($ftem,$this->notNew))
+					{
+						$this->newFiles['static'][] = array( 'path' => $path.'/'.$new, 'name' => $new, 'zip' => $zipPath.'/'.$new );
+					}
+				}
+				elseif ($details->type == 'folder')
+				{
+					// move the folder to its place
+					JFolder::copy($templatePath.'/'.$item, $path.'/'.$new);
+					// count the folder created
+					$this->folderCount++;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * Set the Dynamic File & Folder
+	 *  
+	 * @return  boolean
+	 * 
+	 */
+	private function setDynamique()
+	{
+		$back = false;
+		$front = false;
+		if ((isset($this->joomlaVersionData->move->dynamic) && ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->dynamic)) && (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)))
+		{
+			// setup dashboard
+			$target = array('admin' => $this->componentData->name_code);
+			$this->buildDynamique($target,'dashboard');
+			// now the rest of the views
+			foreach ($this->componentData->admin_views as $nr => $view)
+			{
+				if (ComponentbuilderHelper::checkObject($view['settings']))
+				{
+					if ($view['settings']->name_list != 'null')
+					{
+						$target = array('admin' => $view['settings']->name_list);
+						$this->buildDynamique($target,'list');
+					}
+					if ($view['settings']->name_single != 'null')
+					{
+						$target = array('admin' => $view['settings']->name_single);
+						$this->buildDynamique($target,'single');
+					}
+					if($view['edit_create_site_view'])
+					{
+						// setup the front site edit-view files
+						$target = array('site' => $view['settings']->name_single);
+						$this->buildDynamique($target,'edit');
+					}
+				}
+				// quick set of checkin once
+				if ($view['checkin'] == 1 && !$this->addCheckin)
+				{
+					// switch to add checking to config
+					$this->addCheckin = true;
+				}
+			}
+			$back = true;
+		}
+		if ((isset($this->joomlaVersionData->move->dynamic) && ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->dynamic)) && (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views)))
+		{
+
+			foreach ($this->componentData->site_views as $nr => $view)
+			{
+				if ($view['settings']->main_get->gettype == 2)
+				{
+					// set list view
+					$target = array('site' => $view['settings']->code);
+					$this->buildDynamique($target,'list');
+				}
+				elseif ($view['settings']->main_get->gettype == 1)
+				{
+					// set single view
+					$target = array('site' => $view['settings']->code);
+					$this->buildDynamique($target,'single');
+				}
+			}
+			$front = true;
+		}
+		if ((isset($this->joomlaVersionData->move->dynamic) && ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->dynamic)) && (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views)))
+		{
+			foreach ($this->componentData->custom_admin_views as $nr => $view)
+			{
+				if ($view['settings']->main_get->gettype == 2)
+				{
+					// set list view
+					$target = array('custom_admin' => $view['settings']->code);
+					$this->buildDynamique($target,'list');
+				}
+				elseif ($view['settings']->main_get->gettype == 1)
+				{
+					// set single view
+					$target = array('custom_admin' => $view['settings']->code);
+					$this->buildDynamique($target,'single');
+				}
+			}
+			$back = true;
+		}
+		// chekc if we had success
+		if ($back || $front)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * Set the Static File & Folder
+	 *  
+	 * @param   array   $target  The main target and name
+	 * @param   string   $type  The type in the target
+	 * @param   string   $fileName  The custom file name
+	 * 
+	 * @return  boolean
+	 * 
+	 */
+	public function buildDynamique($target,$type,$fileName = false)
+	{
+		if (ComponentbuilderHelper::checkArray($target))
+		{
+			foreach ($target as  $main => $name)
+			{
+				// make sure it is lower case
+				$name = ComponentbuilderHelper::safeString($name);
+				// setup the files
+				foreach ($this->joomlaVersionData->move->dynamic->{$main} as $item => $details)
+				{
+					if ($details->type == $type)
+					{
+						// set destination path
+						$path =  '';
+						if (strpos($details->path,'VIEW') !== false)
+						{
+							$path = str_replace('VIEW',$name,$details->path);
+						}
+						else
+						{
+							$path = $details->path;
+						}
+						$zipPath	= str_replace('c0mp0n3nt/','', $path);
+						$path		= str_replace('c0mp0n3nt/',$this->componentPath.'/', $path);
+
+						// setup the folder
+						if (!JFolder::exists($path))
+						{
+							JFolder::create($path);
+							$this->indexHTML($zipPath);
+							// count the folder created
+							$this->folderCount++;
+						}
+						// do the file renaming
+						if ($details->rename)
+						{
+							if ($fileName)
+							{
+								$new = str_replace($details->rename, $fileName, $item);
+								$name = $name.'_'.$fileName;
+							}
+							elseif ($details->rename == 'new')
+							{
+								$new = $details->newName;
+							}
+							else
+							{
+								$new = str_replace($details->rename, $name, $item);
+							}
+						}
+						else
+						{
+							$new = $item;
+						}
+						if (!JFile::exists($path.'/'.$new))
+						{
+							// move the file to its place
+							JFile::copy($this->templatePath.'/'.$item, $path.'/'.$new,'',true);
+							// count the file created
+							$this->fileCount++;
+						}
+						// store the new files
+						$this->newFiles['dynamic'][$name][] = array( 'path' => $path.'/'.$new, 'name' => $new , 'view' => $name, 'zip' => $zipPath.'/'.$new);
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	/*
+	 * set the Joomla Version Data
+	 * 
+	 *
+	 * @return  oject The version data
+	 * 
+	 */
+	private function setJoomlaVersionData()
+	{
+		// set the version data
+		$versionData = json_decode(file_get_contents($this->templatePath.'/settings.json'));
+		// add custom folders
+		if ((isset($this->componentData->folders) && ComponentbuilderHelper::checkArray($this->componentData->folders)) || $this->addEximport || $this->uikit || $this->footable)
+		{
+			if ($this->addEximport)
+			{
+				// move the import view folder in place
+				$importView = array( 'folder' => 'importViews', 'path' => 'admin/views/import', 'rename' => 1);
+				$this->componentData->folders[] = $importView;
+				// move the PHPExel Folder
+				$PHPExcel = array( 'folder' => 'PHPExcel', 'path' => 'admin/helpers', 'rename' => 0);
+				$this->componentData->folders[] = $PHPExcel;
+			}
+			if ($this->uikit)
+			{
+				// move the UIKIT Folder into place
+				$uikit = array( 'folder' => 'uikit', 'path' => 'media', 'rename' => 0);
+				$this->componentData->folders[] = $uikit;
+			}
+			if ($this->footable)
+			{
+				// move the footable folder into place
+				$footable = array( 'folder' => 'footable', 'path' => 'media', 'rename' => 0);
+				$this->componentData->folders[] = $footable;
+
+			}
+			
+			// pointer tracker
+			$pointer_tracker = 'h';
+			foreach ($this->componentData->folders as $custom)
+			{
+				// fix path
+				$custom['path'] = rtrim($custom['path'], '/');
+				$custom['path'] = ltrim($custom['path'], '/');
+				// make sure we use the correct name
+				$pathArray = (array) explode('/',$custom['path']);
+				$firstFolder = array_values($pathArray)[0];
+				$lastFolder = end($pathArray);
+				// only rename folder if last has folder name
+				if ($custom['rename'] == 1)
+				{
+					$custom['path'] = str_replace('/'.$lastFolder,'',$custom['path']);
+					$rename = 'new';
+					$newname = $lastFolder;
+					if(($tkey = array_search($lastFolder, $pathArray)) !== false)
+					{
+						unset($pathArray[$tkey]);
+					}
+				}
+				else
+				{
+					$lastFolder = $custom['folder'];
+					$rename = false;
+					$newname = '';
+				}
+				// check if we sould add it to the media xml list
+				if (!isset($this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###']))
+				{
+					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] = '';
+				}
+				if (count($pathArray) == 1 && $firstFolder == 'media')
+				{
+					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+				}
+				// check if we sould add it to the site xml list
+				if (!isset($this->fileContentStatic['###EXSTRA_SITE_FOLDERS###']))
+				{
+					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] = '';
+				}
+				if (count($pathArray) == 1 && $firstFolder == 'site')
+				{
+					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+				}
+				// check if we sould add it to the admin xml list
+				if (!isset($this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###']))
+				{
+					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] = '';
+				}
+				if (count($pathArray) == 1 && $firstFolder == 'admin')
+				{
+					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= "\n\t\t\t<folder>".$lastFolder."</folder>";
+				}
+				// make we have not duplicates
+				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']).'_f'.$pointer_tracker;
+				$pointer_tracker++;
+				// set new folder to object
+				$versionData->move->static->$key_pointer = new stdClass();
+				$versionData->move->static->$key_pointer->naam = $custom['folder'];
+				$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$custom['path'];
+				$versionData->move->static->$key_pointer->rename = $rename;
+				$versionData->move->static->$key_pointer->newName = $newname;
+				$versionData->move->static->$key_pointer->type = 'folder';
+				$versionData->move->static->$key_pointer->custom = true;
+			}
+			unset($this->componentData->folders);
+			unset($custom);
+		}
+		// add custom files
+		if ((isset($this->componentData->files) && ComponentbuilderHelper::checkArray($this->componentData->files)) || $this->addEximport || $this->googlechart)
+		{
+			if ($this->addEximport)
+			{
+				// move the PHPExel main file
+				$PHPExcel = array( 'file' => 'PHPExcel.php', 'path' => 'admin/helpers', 'rename' => 0);
+				$this->componentData->files[] = $PHPExcel;
+			}
+			if ($this->googlechart)
+			{
+				// move the google chart files
+				$googleChart = array( 'file' => 'google.jsapi.js', 'path' => 'media/js', 'rename' => 0);
+				$this->componentData->files[] = $googleChart;
+				$googleChart = array( 'file' => 'chartbuilder.php', 'path' => 'admin/helpers', 'rename' => 0);
+				$this->componentData->files[] = $googleChart;
+			}
+			
+			// pointer tracker
+			$pointer_tracker = 'h';
+			foreach ($this->componentData->files as $custom)
+			{
+				// make we have not duplicates
+				$key_pointer = ComponentbuilderHelper::safeString($custom['file']).'_g'.$pointer_tracker;
+				$pointer_tracker++;
+				// set new file to object
+				$versionData->move->static->$key_pointer = new stdClass();
+				$versionData->move->static->$key_pointer->naam = $custom['file'];
+				// get the path info
+				$pathInfo = pathinfo($custom['path']);
+				if (isset($pathInfo['extension']) && $pathInfo['extension'])
+				{
+					$pathInfo['dirname'] = rtrim($pathInfo['dirname'], '/');
+					$pathInfo['dirname'] = ltrim($pathInfo['dirname'], '/');
+					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$pathInfo['dirname'];
+					$versionData->move->static->$key_pointer->rename = 'new';
+					$versionData->move->static->$key_pointer->newName = $pathInfo['basename'];
+					// set the name
+					$name = $pathInfo['basename'];
+				}
+				else
+				{
+					$custom['path'] = rtrim($custom['path'], '/');
+					$custom['path'] = ltrim($custom['path'], '/');
+					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/'.$custom['path'];
+					$versionData->move->static->$key_pointer->rename = false;
+					// set the name
+					$name = $custom['file'];
+				}
+				// check if file should be updated
+				if (isset($custom['notnew']) && $custom['notnew'] == 0)
+				{
+					$this->notNew[] = $key_pointer;
+				}
+				$versionData->move->static->$key_pointer->type = 'file';
+				$versionData->move->static->$key_pointer->custom = true;
+			}
+			unset($this->componentData->files);
+			unset($custom);
+		}
+		return $versionData;
+	}
+	
+	/*
+	 * set the index.html file in a folder path
+	 * 
+	 * @param   string   $path  The path to place the index.html file in
+	 *
+	 * @return  void
+	 * 
+	 */
+	private function indexHTML($path)
+	{
+		if (strlen($path) > 0)
+		{
+			JFile::copy($this->templatePath.'/index.html', $this->componentPath.'/'.$path.'/index.html');
+			// count the file created
+			$this->fileCount++;
+		}
+		else
+		{
+			JFile::copy($this->templatePath.'/index.html', $this->componentPath.'/index.html');
+			// count the file created
+			$this->fileCount++;
+		}
+	}
+	
+	/*
+	 * Remove folders with files
+	 * 
+	 * @param   string   $dir  The path to folder to remove
+	 * @param   boolean   $git  if there is a git folder in that must not be removed
+	 *
+	 * @return  boolean   True in all is removed
+	 * 
+	 */
+	protected function removeFolder($dir, $git = false)
+	{
+		if (JFolder::exists($dir))
+		{
+			$it = new RecursiveDirectoryIterator($dir);
+			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+			foreach ($it as $file)
+			{
+				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
+				if ($file->isDir())
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFolder::delete($file->getPathname());
+				}
+				else
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFile::delete($file->getPathname());
+				}
+			}
+			if (!$git && JFolder::delete($dir))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+}

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -33,7 +33,27 @@ defined('_JEXEC') or die('Restricted access');
 abstract class ComponentbuilderHelper
 { 
 
-	/**
+	/*
+	 * Compiler autoloader
+	 */
+	public static function autoLoader()
+	{
+		// load the compiler classes
+		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/get.php';
+		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/structure.php';
+		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/interpretation.php';
+		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/infusion.php';
+		// import the Joomla librarys
+		jimport('joomla.filesystem.file');
+		jimport('joomla.filesystem.folder');
+		jimport('joomla.filesystem.archive');
+		jimport('joomla.application.component.modellist');
+		jimport('joomla.application');
+		// include class to minify js
+		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php';
+	}
+
+	 /**
 	 *	indent HTML
 	 */
 	public static function indent($html)
@@ -780,7 +800,7 @@ abstract class ComponentbuilderHelper
 		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.
@@ -796,13 +816,13 @@ abstract class ComponentbuilderHelper
 							{
 								$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_componentbuilder.'.$view.'.' . (int) $record->id))
@@ -812,13 +832,13 @@ abstract class ComponentbuilderHelper
 							{
 								$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_componentbuilder'))
@@ -828,13 +848,13 @@ abstract class ComponentbuilderHelper
 							{
 								$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_componentbuilder'))
@@ -844,13 +864,13 @@ abstract class ComponentbuilderHelper
 							{
 								$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;
 							}
 						}
 					}
@@ -880,13 +900,13 @@ abstract class ComponentbuilderHelper
 								{
 									$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_componentbuilder.'.$views.'.category.' . (int) $record->catid))
@@ -896,13 +916,13 @@ abstract class ComponentbuilderHelper
 								{
 									$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_componentbuilder'))
@@ -912,13 +932,13 @@ abstract class ComponentbuilderHelper
 								{
 									$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_componentbuilder'))
@@ -928,21 +948,21 @@ abstract class ComponentbuilderHelper
 								{
 									$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;
 								}
 							}
 						}
 					}
 				}
 			}
-			// if allowed then fall back on component global settings
+			// if allowed then fallback on component global settings
-			if ($allow)
+			if ($fallback)
 			{
 				$result->set($action->name, $user->authorise($action->name, 'com_componentbuilder'));
 			}

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -438,6 +438,8 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE="Add License"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component."
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
+COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_DASHBOARD_METHODS="Add Php Dashboard Methods"
+COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_DASHBOARD_METHODS_LABEL="Add PHP (dashboard Methods)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_ADMIN="Add Php Helper Admin"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_ADMIN_LABEL="Add PHP (helper_admin Class)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_SITE="Add Php Helper Site"
@@ -446,7 +448,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_SITE_EVENT="Add Site Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SITE_EVENT_LABEL="Add Global Site Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL="Add Sql"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_DESCRIPTION="if set in view"
-COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_LABEL="Add MySQL"
+COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_LABEL="Add MySQL (to view table)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_OPTIONS_DESCRIPTION="if being added"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_OPTIONS_LABEL="Options"
 COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW="Adminview"
@@ -456,6 +458,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADMINVIEWS_LABEL="Views"
 COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_DESCRIPTION="Select an admin view"
 COM_COMPONENTBUILDER_COMPONENT_ADMINVIEW_LABEL="View"
 COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS="Admin Views"
+COM_COMPONENTBUILDER_COMPONENT_ADVANCED_ENCRYPTION_ONLY_TO_LOCK_DATA="Advanced encryption (only to lock data)"
 COM_COMPONENTBUILDER_COMPONENT_ALL="All"
 COM_COMPONENTBUILDER_COMPONENT_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_COMPONENT_ARROW_DOWN="Arrow Down"
@@ -562,6 +565,8 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ADD_DESCRIPTION="Select if the view sho
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ADD_LABEL="Dashboard (add record)"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_DESCRIPTION="Select if the view should show on the dashboard."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_LIST_LABEL="Dashboard (list of records)"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB="Dashboard Tab"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_DATABASE="Database"
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR="Debug Linenr"
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers, so to see where in the compiler the line of code was build."
@@ -579,9 +584,9 @@ COM_COMPONENTBUILDER_COMPONENT_EDIT="Editing the Component"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION="add site edit & create view for this admin view"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_LABEL="Edit/Create Site View"
 COM_COMPONENTBUILDER_COMPONENT_EMAIL="Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="Author Email Here"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="demo@example.com"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Author Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Email"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added."
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields"
@@ -630,6 +635,9 @@ COM_COMPONENTBUILDER_COMPONENT_FRONT="Front"
 COM_COMPONENTBUILDER_COMPONENT_GENERIC="Generic"
 COM_COMPONENTBUILDER_COMPONENT_GRID="Grid"
 COM_COMPONENTBUILDER_COMPONENT_GRID_TWO="Grid 2"
+COM_COMPONENTBUILDER_COMPONENT_HEADER_DESCRIPTION="Enter Header Here"
+COM_COMPONENTBUILDER_COMPONENT_HEADER_HINT="Header Here"
+COM_COMPONENTBUILDER_COMPONENT_HEADER_LABEL="Header"
 COM_COMPONENTBUILDER_COMPONENT_HEALTH="Health"
 COM_COMPONENTBUILDER_COMPONENT_HEART="Heart"
 COM_COMPONENTBUILDER_COMPONENT_HEART_TWO="Heart 2"
@@ -637,6 +645,8 @@ COM_COMPONENTBUILDER_COMPONENT_HISTORY_DESCRIPTION="Select if the items of this
 COM_COMPONENTBUILDER_COMPONENT_HISTORY_LABEL="Keep History"
 COM_COMPONENTBUILDER_COMPONENT_HOME="Home"
 COM_COMPONENTBUILDER_COMPONENT_HOME_TWO="Home 2"
+COM_COMPONENTBUILDER_COMPONENT_HTML_HINT="// Add the tab HTML here. To access php values <?php echo $this->methodname->value; ?>"
+COM_COMPONENTBUILDER_COMPONENT_HTML_LABEL="HTML"
 COM_COMPONENTBUILDER_COMPONENT_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
 COM_COMPONENTBUILDER_COMPONENT_ICOMOON_LABEL="Icon"
 COM_COMPONENTBUILDER_COMPONENT_ICON_DESCRIPTION="Add the icon to the image folder and select it here (128 x 128px)"
@@ -662,7 +672,7 @@ COM_COMPONENTBUILDER_COMPONENT_LICENSE_HINT="Add License Here"
 COM_COMPONENTBUILDER_COMPONENT_LICENSE_LABEL="License"
 COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE="License Type"
 COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_DESCRIPTION="How should the license be implemented."
-COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_LABEL="License Implementation"
+COM_COMPONENTBUILDER_COMPONENT_LICENSE_TYPE_LABEL="Implementation"
 COM_COMPONENTBUILDER_COMPONENT_LINK="Link"
 COM_COMPONENTBUILDER_COMPONENT_LINK_DESCRIPTION="Enter menu link"
 COM_COMPONENTBUILDER_COMPONENT_LINK_HINT="Menu Link Here"
@@ -795,6 +805,10 @@ COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT="Php Admin Event"
 COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION="PHP script for the global helper admin event method."
 COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_HINT="// add custom PHP script to the global helper admin event method."
 COM_COMPONENTBUILDER_COMPONENT_PHP_ADMIN_EVENT_LABEL="Global Helper Admin Event"
+COM_COMPONENTBUILDER_COMPONENT_PHP_DASHBOARD_METHODS="Php Dashboard Methods"
+COM_COMPONENTBUILDER_COMPONENT_PHP_DASHBOARD_METHODS_DESCRIPTION="PHP methods to place in the dashboard model."
+COM_COMPONENTBUILDER_COMPONENT_PHP_DASHBOARD_METHODS_HINT="// add custom PHP methods to dashboard model. Use the [public function getMethodname()] to insure the data is set to the view, note the convention [public function get...()] replace the .... with the unique method name."
+COM_COMPONENTBUILDER_COMPONENT_PHP_DASHBOARD_METHODS_LABEL="PHP Dashboard Methods"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN="Php Helper Admin"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_HINT="// The PHP abstract Methods to add to the component helper class. Only Methods! as it will directly be add as methods to the helper class!"
@@ -928,7 +942,7 @@ COM_COMPONENTBUILDER_COMPONENT_WARNING_CIRCLE="Warning Circle"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_HINT="http://www.example.com"
-COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Author Website"
+COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_HINT="Secret Key"
@@ -1001,9 +1015,6 @@ COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
-COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION="Here you can set the path to the git folder."
-COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT="/home/user/git"
-COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL="Git Folder Path"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC="The Global Parameters"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL="Global"
 COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD="Gradient"
@@ -1016,8 +1027,6 @@ COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION="The compiler
 COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL="Moving The Compiler Folder"
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION="The custom folder is where all files and folders that you would like to include in your components are stored, the default location is [administrator/components/com_componentbuilder/custom]. You can move this folder by adding your own path here. Remember to move the content of the default custom folder to this new location."
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL="Moving The Custom Folder"
-COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION="You must set the folder where all the components should be deployed for git. You will have to still do your git commit and other git commands yourself. Each component will create their own folder inside this git folder."
-COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL="Adding git to your compiler method"
 COM_COMPONENTBUILDER_CONFIG_ONLY_EXTRA="Only Extra"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
 for developing fast and powerful web interfaces. For more info visit <a href="http://getuikit.com/" >http://getuikit.com/</a>"
@@ -1881,7 +1890,7 @@ COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Foo
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Add JavaScript (views-footer)"
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER="Add Javascript View Footer"
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (view-footer)"
-COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_VDMKEY="Advance Encryption (VDM-key)"
+COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY="Advance Encryption (WHMCS-key)"
 COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR="base64"
 COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY="Basic Encryption (local-key)"
 COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
@@ -29,7 +29,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->jswfields;
+$items	= $displayData->vwzfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
@@ -29,7 +29,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->mdyadmin_views;
+$items	= $displayData->vweadmin_views;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit";

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.0.8
+	@version		2.1.1
-	@build			30th January, 2016
+	@build			1st March, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php