Added #31 feature to build fields and views dynamically via a sql dump. Fixed #29 to insure that a redirect loop does not occur easily. Made many other compiler improvements.

README.md

@@ -1,12 +1,14 @@
-# ###Component_name### (###VERSION###)
+# Component Builder (2.2.6)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
- ![###Component_name### image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The ###Component_name###")
+ ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The Component Builder")
 
-###DESCRIPTION###
+The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (###VERSION###) with **ALL** its features and **ALL** concepts totally open-source and free!
+Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
+
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.6) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -64,7 +66,7 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 + You can change/improve existing field types and add more.
 + Line numbers to show where in compiler was the code build.
 + You can improve the component since all code are open-source.
-+ You need only pay us once and use the component forever.
++ Free updates for the lifetime of the project.
 + You can dynamically add internal help structures to all component.
 + There is no limitations on how big or how much you want to build (server limitation only).
 + This is a complete factory kind of component that functions like a deployment hub.
@@ -72,14 +74,14 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
 # Get Access to Video Tutorials
 
-> **You can purchase more demo content for ###Component_name### including access to training & help video tutorials:**
+> **You can purchase more demo content for Component Builder including access to training & help video tutorials:**
 
 + 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)
 + Help View Integration*
 + Training & Help Videos* tutorials in the component included.
 
-[**GET ACCESS NOW!**](https://www.vdm.io/joomla-component-builder#get)
+[**GET ACCESS NOW!**](http://vdm.bz/component-builder)
 
 # gitHub Support
 
@@ -98,23 +100,23 @@ Component Builder is mapped as a component in itself on my local development env
 
 # Build Details
 
-+ *Company*: [###COMPANYNAME###](###AUTHORWEBSITE###)
++ *Company*: [Vast Development Method](http://vdm.bz/component-builder)
-+ *Author*: [###AUTHOR###](mailto:###AUTHOREMAIL###)
++ *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
-+ *Name*: [###Component_name###](###AUTHORWEBSITE###)
++ *Name*: [Component Builder](http://vdm.bz/component-builder)
-+ *First Build*: ###CREATIONDATE###
++ *First Build*: 30th April, 2015
-+ *Last Build*: ###BUILDDATE###
++ *Last Build*: 30th December, 2016
-+ *Version*: ###VERSION###
++ *Version*: 2.2.6
-+ *Copyright*: ###COPYRIGHT###
++ *Copyright*: Copyright (C) 2015. All Rights Reserved
-+ *License*: ###LICENSE###
++ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **###LINE_COUNT###**
++ *Line count*: **87155**
-+ *File count*: **###FILE_COUNT###**
++ *File count*: **545**
-+ *Folder count*: **###FOLDER_COUNT###**
++ *Folder count*: **100**
 
-> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
+> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 
 ## Donations
 
- If you want to support this project, please consider donating:
+Come on buy me a coffee :)
  * PayPal: pay@vdm.io
  * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.2.0)
+# Component Builder (2.2.6)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.0) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.6) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -66,7 +66,7 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 + You can change/improve existing field types and add more.
 + Line numbers to show where in compiler was the code build.
 + You can improve the component since all code are open-source.
-+ You need only pay us once and use the component forever.
++ Free updates for the lifetime of the project.
 + You can dynamically add internal help structures to all component.
 + There is no limitations on how big or how much you want to build (server limitation only).
 + This is a complete factory kind of component that functions like a deployment hub.
@@ -81,7 +81,7 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 + Help View Integration*
 + Training & Help Videos* tutorials in the component included.
 
-[**GET ACCESS NOW!**](https://www.vdm.io/joomla-component-builder#get)
+[**GET ACCESS NOW!**](http://vdm.bz/component-builder)
 
 # gitHub Support
 
@@ -100,23 +100,23 @@ Component Builder is mapped as a component in itself on my local development env
 
 # Build Details
 
-+ *Company*: [Vast Development Method](https://www.vdm.io/joomla-component-builder)
++ *Company*: [Vast Development Method](http://vdm.bz/component-builder)
 + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
-+ *Name*: [Component Builder](https://www.vdm.io/joomla-component-builder)
++ *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 23rd October, 2016
++ *Last Build*: 30th December, 2016
-+ *Version*: 2.2.0
++ *Version*: 2.2.6
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **85920**
++ *Line count*: **87155**
-+ *File count*: **537**
++ *File count*: **545**
-+ *Folder count*: **99**
++ *Folder count*: **100**
 
-> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
+> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 
 ## Donations
 
- If you want to support this project, please consider donating:
+Come on buy me a coffee :)
  * PayPal: pay@vdm.io
  * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3

admin/assets/css/admin.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/admin_view.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/admin_views.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/component.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/components.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/custom_admin_view.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/custom_admin_views.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/dashboard.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/dynamic_get.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/dynamic_gets.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/field.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/fields.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/fieldtype.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/fieldtypes.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/help_document.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/help_documents.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/layout.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/layouts.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/site_view.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/site_views.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/snippet.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/snippets.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/template.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/assets/css/templates.css

@@ -9,12 +9,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/compiler/joomla_3/Helper.php

@@ -33,7 +33,7 @@ defined('_JEXEC') or die('Restricted access');
  * ###Component### component helper.
  */
 abstract class ###Component###Helper
-{###ADMIN_GLOBAL_EVENT_HELPER### ###CUSTOM_HELPER_SCRIPT###
+{###ADMIN_GLOBAL_EVENT_HELPER### ###CUSTOM_HELPER_SCRIPT### ###BOTH_CUSTOM_HELPER_SCRIPT###
 	/**
 	*	Load the Component xml manifest.
 	**/
@@ -265,7 +265,7 @@ abstract class ###Component###Helper
 			{
 				// The record has been set. Check the record permissions.
 				$permission = $user->authorise($action->name, 'com_###component###.'.$view.'.' . (int) $record->id);
-				if (!$permission && !is_null($permission))
+				if (!$permission) // TODO removed && !is_null($permission)
 				{
 					if ($action->name == 'core.edit' || $action->name == $view.'.edit')
 					{
@@ -600,10 +600,22 @@ abstract class ###Component###Helper
 		return false;
 	}
 
-	public static function checkArray($array)
+	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
 		{
+			// also make sure the empty strings are removed
+			if ($removeEmptyString)
+			{
+				foreach ($array as $key => $string)
+				{
+					if (empty($string))
+					{
+						unset($array[$key]);
+					}
+				}
+				return self::checkArray($array, false);
+			}
 			return true;
 		}
 		return false;

admin/compiler/joomla_3/Helper_site.php

@@ -33,7 +33,7 @@ defined('_JEXEC') or die('Restricted access');
  * ###Component### component helper
  */
 abstract class ###Component###Helper
-{###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT###
+{###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT### ###BOTH_CUSTOM_HELPER_SCRIPT###
 	
 	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
@@ -408,7 +408,7 @@ abstract class ###Component###Helper
 			{
 				// The record has been set. Check the record permissions.
 				$permission = $user->authorise($action->name, 'com_###component###.'.$view.'.' . (int) $record->id);
-				if (!$permission && !is_null($permission))
+				if (!$permission) // TODO removed && !is_null($permission)
 				{
 					if ($action->name == 'core.edit' || $action->name == $view.'.edit')
 					{
@@ -592,10 +592,22 @@ abstract class ###Component###Helper
 		return false;
 	}
 
-	public static function checkArray($array)
+	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
 		{
+			// also make sure the empty strings are removed
+			if ($removeEmptyString)
+			{
+				foreach ($array as $key => $string)
+				{
+					if (empty($string))
+					{
+						unset($array[$key]);
+					}
+				}
+				return self::checkArray($array, false);
+			}
 			return true;
 		}
 		return false;

admin/compiler/joomla_3/JModelAdmin.php

@@ -181,7 +181,7 @@ class ###Component###Model###View### extends JModelAdmin
 	 * @since   1.6
 	 */
 	protected function prepareTable($table)
-	{
+	{###LICENSE_TABLE_LOCKED_CHECK###
 		$date = JFactory::getDate();
 		$user = JFactory::getUser();
 		

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -181,7 +181,7 @@ class ###Component###Model###View### extends JModelAdmin
 	 * @since   1.6
 	 */
 	protected function prepareTable($table)
-	{
+	{###LICENSE_TABLE_LOCKED_CHECK###
 		$date = JFactory::getDate();
 		$user = JFactory::getUser();
 		

admin/compiler/joomla_3/JModelItem_custom_admin.php

@@ -99,7 +99,7 @@ class ###Component###Model###SView### extends JModelItem
                 {
 			$app = JFactory::getApplication();
 			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
-			// redirect away if not a correct (TODO for now we go to default view)
+			// redirect away if not a correct to cPanel/default view
 			$app->redirect('index.php?option=com_###component###');
 			return false;
                 }

admin/compiler/joomla_3/JModelItem_site.php

@@ -95,16 +95,7 @@ class ###Component###Model###SView### extends JModelItem
 	 */
 	public function getItem($pk = null)
 	{
-		$this->user	= JFactory::getUser();
+		$this->user		= JFactory::getUser();###USER_PERMISSION_CHECK_ACCESS###
-                // check if this user has permission to access item
-                if (!$this->user->authorise('site.###sview###.access', 'com_###component###'))
-                {
-			$app = JFactory::getApplication();
-			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
-			// redirect away if not a correct (TODO for now we go to default view)
-			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
-			return false;
-                }
 		$this->userId		= $this->user->get('id');
 		$this->guest		= $this->user->get('guest');
                 $this->groups		= $this->user->get('groups');

admin/compiler/joomla_3/JModelList_site.php

@@ -77,16 +77,7 @@ class ###Component###Model###SViews### extends JModelList
 	 */
 	public function getItems()
 	{
-		$user = JFactory::getUser();
+		$user = JFactory::getUser();###USER_PERMISSION_CHECK_ACCESS### ###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS###
-                // check if this user has permission to access items
-                if (!$user->authorise('site.###sview###.access', 'com_###component###'))
-                {
-			$app = JFactory::getApplication();
-			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
-			// redirect away if not a correct (TODO for now we go to default view)
-			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
-			return false;
-                }###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS###
 		// load parent items
 		$items = parent::getItems();
 

admin/compiler/joomla_3/router.php

@@ -127,16 +127,10 @@ class ###Component###Router extends JComponentRouterBase
 	 * @since   3.3
 	 */
 	public function parse(&$segments)
-	{
+	{		
-		//var_dump($segments);
-		//$app = JFactory::getApplication();
-		//$menu = $app->getMenu();
-		//$item = $menu->getActive();
-		
 		$count = count($segments);
 		$vars = array();
-				
+		
-		//var_dump($item->query['view']);
 		//Handle View and Identifier
 		switch($segments[0])
 		{###ROUTER_PARSE_SWITCH###
@@ -145,7 +139,7 @@ class ###Component###Router extends JComponentRouterBase
 		return $vars;
 	} 
 
-	protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = '###component###')
+	protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = '###component###')
 	{
 		if(!$where)
 		{
@@ -157,7 +151,7 @@ class ###Component###Router extends JComponentRouterBase
 		$query = $db->getQuery(true);
 
 		$query->select($db->quoteName(array($what)));
-		if ('categories' == $table || 'category' == $table)
+		if ('categories' == $table || 'category' == $table || $category)
 		{
 			$query->from($db->quoteName('#__categories'));
 		}

admin/componentbuilder.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controller.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/admin_view.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.admin_view.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_view.' . $recordId))
 				{

admin/controllers/admin_views.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/ajax.json.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -42,6 +42,8 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		JResponse::setHeader('Content-Disposition','attachment;filename="getajax.json"');
 		JResponse::setHeader("Access-Control-Allow-Origin", "*");
 		// load the tasks 
+		$this->registerTask('isNew', 'ajax');
+		$this->registerTask('isRead', 'ajax');
 		$this->registerTask('tableColumns', 'ajax');
 		$this->registerTask('fieldSelectOptions', 'ajax');
 		$this->registerTask('getImportScripts', 'ajax');
@@ -67,6 +69,82 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 			$task = $this->getTask();
 			switch($task)
                         {
+				case 'isNew':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$noticeValue = $jinput->get('notice', NULL, 'STRING');
+						if($noticeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->isNew($noticeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
+				case 'isRead':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$noticeValue = $jinput->get('notice', NULL, 'STRING');
+						if($noticeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->isRead($noticeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'tableColumns':
 					try
 					{

admin/controllers/compiler.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/component.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -85,7 +85,7 @@ class ComponentbuilderControllerComponent extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.component.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.component.' . $recordId))
 				{

admin/controllers/componentbuilder.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/components.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/custom_admin_view.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.custom_admin_view.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.custom_admin_view.' . $recordId))
 				{

admin/controllers/custom_admin_views.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/dynamic_get.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('dynamic_get.edit.own', 'com_componentbuilder.dynamic_get.' . $recordId))
 				{

admin/controllers/dynamic_gets.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/field.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -117,7 +117,7 @@ class ComponentbuilderControllerField extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('field.edit', 'com_componentbuilder.field.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('field.edit.own', 'com_componentbuilder.field.' . $recordId))
 				{

admin/controllers/fields.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/fieldtype.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -117,7 +117,7 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('fieldtype.edit.own', 'com_componentbuilder.fieldtype.' . $recordId))
 				{

admin/controllers/fieldtypes.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/help.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/help_document.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('help_document.edit', 'com_componentbuilder.help_document.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('help_document.edit.own', 'com_componentbuilder.help_document.' . $recordId))
 				{

admin/controllers/help_documents.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/import.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/layout.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerLayout extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.layout.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.layout.' . $recordId))
 				{

admin/controllers/layouts.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/site_view.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.site_view.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.site_view.' . $recordId))
 				{

admin/controllers/site_views.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/snippet.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.snippet.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.snippet.' . $recordId))
 				{

admin/controllers/snippets.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/controllers/template.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -99,7 +99,7 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 		{
 			// The record has been set. Check the record permissions.
 			$permission = $user->authorise('core.edit', 'com_componentbuilder.template.' . (int) $recordId);
-			if (!$permission && !is_null($permission))
+			if (!$permission)
 			{
 				if ($user->authorise('core.edit.own', 'com_componentbuilder.template.' . $recordId))
 				{

admin/controllers/templates.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/custom/downloadController_sermonDistributor.php

@@ -45,8 +45,8 @@ class ###Component###ControllerDownload extends JControllerLegacy
 			switch($task)
                         {
 				case 'file':
-					$keys = $jinput->get('key', NULL, 'BASE64');
+					$keys = ###Component###Helper::base64_urldecode($jinput->get('key', NULL, 'STRING'));
-					$enUrl = $jinput->get('link', NULL, 'BASE64');
+					$enUrl = ###Component###Helper::base64_urldecode($jinput->get('link', NULL, 'STRING'));
 					$filename = $jinput->get('filename', NULL, 'CMD');
 					if((base64_encode(base64_decode($enUrl, true)) === $enUrl) && (base64_encode(base64_decode($keys, true)) === $keys) && $filename)
 					{
@@ -59,8 +59,8 @@ class ###Component###ControllerDownload extends JControllerLegacy
 							$name = ###Component###Helper::safeString($filename, 'Ww');
 							// Get local key
 							$localkey = ###Component###Helper::getLocalKey();
-							$opener = new FOFEncryptAes($localkey, 256);
+							$opener = new FOFEncryptAes($localkey, 128);
-							$link = rtrim($opener->decryptString(base64_decode($enUrl)));
+							$link = rtrim($opener->decryptString($enUrl), "\0");
 							$info = $this->getContentInfo($link);
 							// set headers
 							$app = JFactory::getApplication();
@@ -108,7 +108,7 @@ class ###Component###ControllerDownload extends JControllerLegacy
 				break;
 			}
 		}
-		return false;
+		die('Restricted access');
 	}
 	
 	protected function getContentInfo($url)

admin/custom/dropbox.php

@@ -3,9 +3,9 @@
 				Vast Development Method
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.0 - 01st July, 2015
+	@version			2.0.0 - 03rd November, 2016
-	@package		Dropbox Links builder
+	@package		Dropbox API 2
-	@subpackage		dropboxlinks.php
+	@subpackage		dropbox.php
 	@author			Llewellyn 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
@@ -20,295 +20,406 @@ defined('_JEXEC') or die;
  */
 class Dropbox
 {
-	// the file name
+	/**
-	public $fileName;
+	 * final url
+	 */
+	protected $url;
+	
+	/**
+	 * The array for the post url
+	 */
+	protected $postUrl = array( 
+		"protocol" => "https://",
+		"suddomain" => "api.",
+		"domain" => "dropboxapi.com",
+		"path" => "/2/"
+	);
 
-	// the file array
+	/**
-	public $files = array();
+	 * the verious pathes we need
+	 */	
+	protected $domainpath = array( 
+		"list_folder" => "files/list_folder",
+		"list_folder_continue" => "files/list_folder/continue",
+		"create_shared_link" => "sharing/create_shared_link",
+		"get_shared_link_metadata" => "sharing/get_shared_link_metadata",
+		"revoke" => "auth/token/revoke"
+	);
 
-	// the extension to get
+	/**
-	protected $getfiles = array();
+	 * the target pathe to get
+	 */	
+	protected $targetPath = false;
+	protected $targetPathOriginal = false;
 
-	// the extensions to leave
+	/**
-	protected $notfiles = array();
+	 * oauth token
+	 */	
+	protected $oauthToken;
 
-	// the folder array
+	/**
-	protected $folders = array();
+	 * the verious pathes we need
+	 */	
+	protected $permissionType;
 
-	// folder identifiers
+	/**
-	protected $getfolders = array('?dl=0');
+	 * The loop controller in calling Dropbox API
+	 */	
+	protected $continueCalling = array();
 
-	// the list of extension to help identify what is folders (not exhaustive, only some of the commen files)
+	/**
-	protected $notfolders = array(
+	 * the success switch
-		'.3gp','.3gpp','.7z','.aac','.act','.aiff','.aiff','.amr','.ape','.ar','.asf','.au','.avi','.awb','.bmp','.bup','.bzip2','.crx','.css','.dct','.deb','.djvu',
+	 */	
-		'.doc','.docx','.drc','.dss','.ear','.egg','.exe','.flac','.flv','.gif','.gifv','.gzip','.htaccess','.html','.ico','.ini','.iso','.jar','.jpeg','.jpg','.js',
+	protected $succes;
-		'.json','.lzip','.m3u','.m4a','.m4p','.m4v','.mkv','.mmf','.mng','.mov','.mp3','.mp4','.mpc','.mpeg','.mpeg4','.mpegps','.mpg','.mpkg','.msi','.odt','.ogg',
-		'.opus','.pdf','.pea','.php','.pkg','.png','.ppt','.pptx','.ps','.psd','.pst','.pxv','.rar','.raw','.rm','.rmvb','.rpm','.rtf','.shar','.sql','.svg','.sxw',
-		'.tar','.tgz','.tgz','.tiff','.txt','.veg','.vep','.vob','.wav','.webm','.wma','.wmv','.xar','.xls','.xml','.yuv','.zip' );
 
-	// the directory where the downloaded files should be stored
+	/**
-	protected $dir;
+	 * the type call
+	 */	
+	protected $type;
+
+	/**
+	 * the query for the call
+	 */	
+	protected $query;
+
+	/**
+	 * the query for the call
+	 */	
+	protected $model;
+
+	/**
+	 * the mediaData bucket
+	 */	
+	public $mediaData = array();
+
+	/**
+	 * the error messages
+	 */	
+	public $error_summary = array();
+	
+	/**
+	* 	force the update to reset
+	**/
+	public $forceReset = false;
 
 	/**
 	 * Constructor
 	 */
-	public function __construct($mainurl, $config = array('save' => false, 'filename' => 'dropbox', 'download' => false, 'dir' => __DIR__))
+	public function __construct(JModelLegacy $model, $buildType)
 	{
-		if ($this->checkArray($config))
+		// set the url at this point for now
+		$this->url = $this->postUrl["protocol"].$this->postUrl["suddomain"].$this->postUrl["domain"].$this->postUrl["path"];
+		// set the local model
+		$this->model = $model;
+		// set the build type
+		$this->build = (int) $buildType;
+	}
+
+	/**
+	 * getFiles
+	 * 
+	 * =============
+	 * $details
+	 * =============
+	 * sourceID
+	 * dropboxOption
+	 * dropboxTarget
+	 * addTypes
+	 * 
+	 */
+	public function getFiles($token, $permissiontype, $details = array())
+	{
+		// we need more then the normal time to run this script 5 minutes at least.
+		ini_set('max_execution_time', 500);
+		// set the oauth toke
+		$this->oauthToken = $token;
+		
+		// set the permission type
+		$this->permissionType = $permissiontype;
+		
+		// set the details
+		if ($this->checkArray($details))
 		{
-			// we need more then the normal time to run this script 5 minutes at least.
+			foreach ($details as $detail => $value)
-			ini_set('max_execution_time', 500); // TODO this is not the best option I am sure, but for now seems like the only option.
-			// set main url
-			$this->mainurl = $mainurl;
-			// if custom get list is set use it
-			if (isset($config['get']) && $this->checkArray($config['get']))
 			{
-				$this->getfiles = $config['get'];
+				$this->$detail = $value;
-			}
-			elseif (isset($config['get']) && $this->checkString($config['get']))
-			{
-				$this->getfiles = array($config['get']);
-			}
-			// if custom excludelist is set use it
-			if (isset($config['not']) && $this->checkArray($config['not']))
-			{
-				$this->notfiles = $config['not'];
-			}
-			elseif (isset($config['not']) && $this->checkString($config['not']))
-			{
-				$this->notfiles = array($config['not']);
-			}
-			// set main folder name
-			$this->fileName = (isset($config['filename'])) ? md5($this->mainurl.$config['filename']) : md5($this->mainurl.'nofilenamewasset');
-			// set save switch
-			$save = (isset($config['save'])) ? $config['save'] : false;
-			// set download switch
-			$download = (isset($config['download'])) ? $config['download'] : false;
-			// make sure the note folder identifiers are complete
-			$this->notfolders = array_unique(array_merge($this->getfiles,$this->notfiles,$this->notfolders));
-			// set local directory
-			$this->dir = (isset($config['dir'])) ? $config['dir'] : __DIR__;
-			// check if the parching of the drobox files is up to date
-			if (($json = @file_get_contents($this->fileName.".json")) !== FALSE)
-			{
-				$this->files = json_decode($json, true);
-			}
-			else
-			{
-				// set all folders
-				$this->parseFolders($this->mainurl, 'VDM_pLeK_h0uEr');
-			}
-			// check if we should save the file
-			if ($save)
-			{
-				$this->save();
-			}
-			// check if we should download the file
-			if ($download)
-			{
-				$this->download();
 			}
+		}
+		
+		// set the curent folder path
+		if (!$this->setFolderPath())
+		{
+			return false;
+		}
+		
+		// start the main factory that calles for the folder data
+		$this->query = array("path" => $this->targetPath, "recursive" => true, "include_media_info" => true);
+		$this->type = 'list_folder';
+		if ($this->makeCall())
+		{
+			return true;
+		}
+	}
+	
+	public function revokeToken($token = null)
+	{
+		if ($token)
+		{
+			// set the oauth toke
+			$this->oauthToken = $token;
+		}
+		// set the call to revoke the token
+		$this->query = 'null';
+		$this->type = 'revoke';
+		if ($this->makeCall())
+		{
 			return true;
 		}
 		return false;
 	}
-
+	
-	public function download($dir = null)
+	protected function setFolderPath()
 	{
-		if ($this->checkArray($this->files))
+		if ('full' == $this->permissionType && isset($this->dropboxOption) && isset($this->dropboxTarget) && $this->checkString($this->dropboxTarget))
 		{
-			// insure the directory is set
+			if (2 == $this->dropboxOption)
-			$dir = ($dir) ? $dir : $this->dir;
-			foreach($this->files as $path => $url)
 			{
-				// now setup correct path
+				// simply set the path
-				$path = str_replace('VDM_pLeK_h0uEr', $dir, $path);
+				$this->targetPath = '/'.trim(strtolower($this->dropboxTarget), '/');
-				// boom here we go move....
+				
-				$this->getFile($url, $path);
+				return true;
+			}
+			elseif (1 == $this->dropboxOption)
+			{
+				// make a call to get the path
+				$this->query = array("url" => $this->dropboxTarget);
+				$this->type = 'get_shared_link_metadata';
+				if ($this->makeCall())
+				{
+					return true;
+				}
 			}
 		}
-	}
+		elseif ('app' == $this->permissionType)
-
-	public function getFile($url, $path)
-	{
-		$newfname = $path;
-		if (($file = @fopen($url, "rb")) !== FALSE)
 		{
-			$filename = substr($path, strrpos($path, '/'));
+			$this->targetPath = "";
-			$makePath = str_replace($filename,'',$path);
+			
-			if (!file_exists($makePath))
+			return true;
-			{
+		}
-				mkdir($makePath, 0755, true);
+		return false;
-			}
+	}
-
+	
-			$newf = fopen($newfname, "wb");
+	protected function makeCall()
+	{
+		if ($this->_isCurl())
+		{
+			return $this->makeCurlCall();
 		}
 		else
 		{
-			echo 'error! '.$url.' not found';
+			return $this->makeGetCall();
-		}
-
-		if ($newf)
-		{
-			while(!feof($file))
-			{
-			  fwrite($newf, fread($file, 1024 * 8 ), 1024 * 8 );
-			}
-		}
-
-		if ($file)
-		{
-			fclose($file);
-		}
-
-		if ($newf)
-		{
-			fclose($newf);
 		}
 	}
-
+	
-	public function save($filename = null)
+	protected function makeGetCall()
 	{
-		if ($this->checkString($filename))
+		
+		$options = array(
+			'http' => array(
+				'header' => "Content-Type: application/json\r\n".
+					"Authorization: Bearer ".$this->oauthToken,
+				'method'  => "POST"
+			),
+		);
+		
+		if ($this->checkArray($this->query))
 		{
-			// set main folder name
+			$this->query = json_encode($this->query);
-			$this->fileName = md5($this->mainurl.$filename);
 		}
-		if ($this->checkArray($this->files))
+		$options['http']['content'] = $this->query;
-		{
+		
-			$data = json_encode($this->files);
+		$context = stream_context_create($options);
-			// now save this folders data to a file.
+		$response = file_get_contents($this->url.$this->domainpath[$this->type], false, $context);
-			$this->saveJson($data);
 
-			return true;
+
+		if ($response === FALSE)
+		{
+			$this->error_summary[] = $this->type.'_error';
+			return false;
+		}
+		else
+		{
+			// store the result
+			return $this->setTheResult(json_decode($response));
+		}
+	}
+	
+	protected function makeCurlCall()
+	{
+		$headers = array('Authorization: Bearer '. $this->oauthToken,
+		    'Content-Type: application/json'
+		);
+		
+		$ch = curl_init($this->url.$this->domainpath[$this->type]);
+		
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+		// check if query is set		
+		if ($this->checkArray($this->query))
+		{
+			$this->query = json_encode($this->query);
+		}
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
+		curl_setopt($ch, CURLOPT_POST, true);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		// curl_setopt($ch, CURLOPT_VERBOSE, 1); // debug
+		
+		$response = curl_exec($ch);
+		
+		curl_close($ch);
+		
+		if ($this->checkJson($response))
+		{
+			$response = json_decode($response);
+		}
+		// store the result
+		return $this->setTheResult($response);
+	}
+	
+	protected function setTheResult($data)
+	{
+		// if there was an error stop!!!
+		if (isset($data->error_summary))
+		{
+			$this->error_summary[] = $data->error_summary;
+			$this->forceReset = true;
+			return false;
+		}
+		
+		// deal with each type
+		switch ($this->type)
+		{
+			case "list_folder":			
+			case "list_folder_continue":
+				if (isset($data->entries) && $this->checkArray($data->entries))
+				{
+					if ($this->storeFiles($data->entries))
+					{
+						// run the continue if needed
+						if (isset($data->has_more) && $data->has_more && isset($data->cursor))
+						{
+							// start the main factory that calles for the folder data
+							$this->query = array("cursor" => $data->cursor);
+							$this->type = 'list_folder_continue';
+							if ($this->makeCall())
+							{
+								return true;
+							}
+						}
+						return true;
+					}
+				}
+				$this->error_summary[] = $this->type.'_error';
+				break;
+			case "create_shared_link":
+				if (isset($data->url) && isset($data->path) && $this->storeSharedLink($this->fixPath($data->path), str_replace('?dl=0','?dl=1',$data->url)))
+				{
+					// we stored the link
+					return true;
+				}
+				$this->error_summary[] = $this->type.'_error';
+				break;
+			case "get_shared_link_metadata":
+				if (isset($data->path_lower))
+				{
+					$this->targetPath = $data->path_lower;
+					return true;
+				}
+				$this->error_summary[]	= $this->type.'_error';
+				break;
+			case "revoke":
+				if (is_null($data))
+				{
+					return true;
+				}
+				$this->error_summary[] = $this->type.'_error';
+				break;
+		}
+		$this->forceReset = true;
+		return false;
+	}
+	
+	protected function storeSharedLink($path, $url)
+	{
+		// we need to store the url to DB
+		if (isset($this->mediaData[$path]))
+		{
+			$localListing				= array();
+			$localListing['id']			= 0;
+			$localListing['name']			= $this->mediaData[$path]['name'];
+			$localListing['size']			= $this->mediaData[$path]['size'];
+			$localListing['key']			= $path;
+			$localListing['url']			= $url;
+			$localListing['build']			= $this->build;
+			$localListing['external_source']	= (int) $this->sourceID;
+			// free some memory
+			unset($this->mediaData[$path]);
+			// check if item already set
+			if ($id = $this->model->searchForId($path))
+			{
+				// update item
+				$localListing['id'] = $id;
+			}
+			return $this->model->save($localListing);
 		}
 		return false;
 	}
 
-	protected function saveJson($data)
+	protected function storeFiles($entries)
-	{
+	{		
-		if ($this->checkString($data))
+		foreach ($entries as $item)
-		{
+		{			
-			/*
+			if (isset($item->{'.tag'}) && 'file' == $item->{'.tag'} && isset($item->name))
-				for now it will save
-				the files in the same
-				directory as the php
-				file where the class
-				is called we will have
-				to change this to suite
-				your custom needs.
-			*/
-			$fp = fopen($this->fileName.'.json', 'w');
-			fwrite($fp, $data);
-			fclose($fp);
-		}
-	}
-
-	protected function parseFolders($url, $foldername)
-	{
-		if ($this->checkString($url))
-		{
-			// get the page html
-			if (($html = @file_get_contents($url)) !== FALSE)
 			{
-				//Create a new DOM document
+				$addLink = false;
-				$dom = new DOMDocument;
+				// remove if not related to type
-
+				if (isset($this->addTypes) && $this->checkArray($this->addTypes))
-				//Parse the HTML. The @ is used to suppress any parsing errors
-				//that will be thrown if the $html string isn't valid XHTML.
-				@$dom->loadHTML($html);
-
-				//Get all links. You could also use any other tag name here,
-				//like 'img' or 'table', to extract other tags.
-				$links = $dom->getElementsByTagName('a');
-
-				//Iterate over the extracted links and display their URLs
-				if ($this->checkObject($links))
 				{
-					// the types
+					foreach ($this->addTypes as $add)
-					$types = array('folders','files');
-					foreach ($types as $type)
 					{
-						// folder bucket
+						if (strpos($item->name,$add) !== false)
-						$buket = array();
-						foreach ($links as $nr => $link)
 						{
-							// switch to add link
+							$addLink = true;
-							$add = false;
-							// get actual link
-							$href = $link->getAttribute('href');
-							// only use link reated to type
-							if ($this->checkArray($this->{'get'.$type}) && $this->checkString($href))
-							{
-								foreach ($this->{'get'.$type} as $get)
-								{
-									if (!$add)
-									{
-										if (strpos($get,'?dl') === false)
-										{
-											$get = $get . '?dl=0';
-										}
-										if (strpos($href,'https://www.dropbox.com/') !== false  && strpos($href,$get) !== false)
-										{
-											$add = true;
-										}
-									}
-								}
-							}
-							else
-							{
-								if (strpos($href,'https://www.dropbox.com/') !== false && strpos($href,'?dl=0') !== false)
-								{
-									$add = true;
-								}
-							}
-
-							// remove if not related to type
-							if ($this->checkArray($this->{'not'.$type}) && $this->checkString($href) && $add)
-							{
-								foreach ($this->{'not'.$type} as $not)
-								{
-									if ($add)
-									{
-										if (strpos($href,$not) !== false)
-										{
-											$add = false;
-										}
-									}
-								}
-							}
-
-							// now add if still related to type
-							if ($add)
-							{
-								if (!in_array($href,$buket))
-								{
-									$name = str_replace('?dl=0','',substr($href, strrpos($href, '/') + 1));
-
-									if ($type == 'folders' && strpos($name,'.') === false)
-									{
-										// parse this folder for more files and sub folders
-										$this->parseFolders($href, $foldername.'/'.str_replace('?lst','',$name));
-										$buket[] = $href;
-										unset($links->$nr);
-
-									}
-									elseif ($type == 'files' && strpos($name,'.') !== false)
-									{
-										// Add to file list
-										$this->files[$foldername.'/'.$name] = str_replace('?dl=0','?dl=1',$href);
-										$buket[] = $href;
-										unset($links->$nr);
-									}
-								}
-							}
 						}
 					}
 				}
-				return true;
+				if ($addLink && isset($item->path_lower))
+				{
+					// store media info
+					$this->mediaData[$this->fixPath($item->path_lower)] = array('name' => $item->name, 'size' => $item->size);
+					// get the shared link
+					$this->query = array("path" => $item->path_lower);
+					$this->type = 'create_shared_link';
+					if (!$this->makeCall())
+					{
+						return false;
+					}
+				}
 			}
 		}
-		return false;
+		return true;
+	}
+	
+	protected function fixPath($path)
+	{
+		if ($this->checkString($this->targetPath))
+		{
+			$path = str_replace($this->targetPath, 'VDM_pLeK_h0uEr', $path);
+		}
+		else
+		{
+			$path = 'VDM_pLeK_h0uEr'.$path;
+		}
+		return $path;
 	}
 
 	protected function checkObject($object)
@@ -328,6 +439,16 @@ class Dropbox
 		}
 		return false;
 	}
+	
+	protected function checkJson($string)
+	{
+		if ($this->checkString($string))
+		{
+			json_decode($string);
+			return (json_last_error() === JSON_ERROR_NONE);
+		}
+		return false;
+	}
 
 	protected function checkString($string)
 	{
@@ -337,6 +458,10 @@ class Dropbox
 		}
 		return false;
 	}
+	
+	protected function _isCurl()
+	{
+		return function_exists('curl_version');
+	}
 }
 
-?>

admin/custom/dropboxupdater.php

@@ -22,10 +22,6 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Dropboxupdater
 {
-	/**
-	* 	to see where we are in the prosses
-	**/
-	public $progress = array('report' => 0);
 	
 	/**
 	* 	update flag (if false update will not happen)
@@ -33,14 +29,19 @@ class Dropboxupdater
 	protected $okay = true;
 	
 	/**
-	* 	the type of linksto update
+	* 	update flag (if false update will not happen)
 	**/
-	protected $type;
+	protected $data = null;
 	
 	/**
-	* 	allow a forced manual update
+	* 	the file Key
 	**/
-	protected $runManual;
+	protected $fileKey;
+	
+	/**
+	* 	allow a forced update
+	**/
+	protected $forceUpdate;
 	
 	/**
 	* 	Todays date-time
@@ -58,14 +59,9 @@ class Dropboxupdater
 	protected $updateMethod;
 	
 	/**
-	* 	update links
+	* 	update targets
 	**/
-	protected $updateLinks = array();
+	protected $updateTarget;
-	
-	/**
-	* 	Listing of dropbox links
-	**/
-	protected $listing = array();
 
 	/**
 	* 	info related to this update
@@ -74,14 +70,19 @@ class Dropboxupdater
 	protected $infoFilePath;
 	
 	/**
-	* 	get the localkey
+	* 	Main dropbox class
 	**/
-	protected $localkey = false;
+	protected $dropbox;
 	
 	/**
 	* 	component parameters
 	**/
 	protected $app_params;
+	
+	/**
+	* 	the errors
+	**/
+	protected $errors = array();
 
 	/**
 	*	everything we want done when initialized
@@ -90,32 +91,68 @@ class Dropboxupdater
 	{
 		// get params
 		$this->app_params = JComponentHelper::getParams('com_###component###');
-
-		// set local key
-		$this->localkey = md5($this->app_params->get('link_encryption', 'localKey34fdWEkl'));
 	}
 
 	/**
-	*	update mehtod
+	*	get the logged errors array
 	**/
-	public function update($type = false, $runManual = false)
+	public function getErrors()
+	{
+		return $this->errors;
+	}
+
+	/**
+	*	set the error to the log
+	**/
+	protected function setErrors($error)
+	{
+		if (###Component###Helper::checkString($error))
+		{
+			$this->errors[] = $error;
+		}
+		elseif (###Component###Helper::checkArray($error))
+		{
+			foreach($error as $log)
+			{
+				if (###Component###Helper::checkString($log))
+				{
+					$this->errors[] = $log;
+				}
+			}
+		}
+	}
+
+	/**
+	*	update method
+	**/
+	public function update($id, $target, $type = false, $forceUpdate = false, $sleutel = null)
 	{
 		if ($type)
 		{
-			// start frech
+			// start fresh
 			$this->okay = true;
-			// set type
+			$this->data = null;
+			// is this a forced run
+			$this->forceUpdate = $forceUpdate;
+			// the file key
+			$this->fileKey = ###Component###Helper::safeString($id.$target.$type);
+			// set the type of this listing
 			$this->type = $type;
-			$this->runManual = $runManual;
 			
-			// set progress file name
+			// get the external source data being updated
-			$this->progressFilePath = JPATH_COMPONENT_SITE.'/helpers/'.md5($this->type.'progress'.$this->localkey).'.json';
+			$this->setExternalSourceData($id);
+			
+			// load the token if manualy set
+			if ($sleutel)
+			{
+				$this->setExternalSourceData($id, array('oauthtoken' => $sleutel));
+			}
 	
 			// what update method is set
 			$this->setUpdateMethod();
 
 			// set the update links
-			$this->setUpdateLinks();
+			$this->setUpdateTarget($target);
 
 			// set needed dates
 			if ($this->okay)
@@ -126,7 +163,7 @@ class Dropboxupdater
 			// get info data or set if not found
 			if ($this->okay)
 			{
-				$this->setInfoData();
+				$this->setUpdateInfoData();
 			}
 
 			// check if update should run now
@@ -134,11 +171,6 @@ class Dropboxupdater
 			{
 				$this->checkUpdateStatus();
 			}
-			// set progress
-			if ($this->okay)
-			{
-				$this->saveProgress();
-			}
 			
 			// before update save update info incase class is called again
 			if($this->okay)
@@ -161,35 +193,60 @@ class Dropboxupdater
 			if ($this->okay)
 			{
 				// set the config
-				$this->setDropboxConfig();
+				$this->setDetailsConfig();
-				// set progress
-				$this->progress['report'] = 30;
-				$this->saveProgress();
 				// load the file
 				JLoader::import('dropbox', JPATH_COMPONENT_SITE.'/helpers');
-				// okay now update
+				$build = 1;
-				if ($this->doUpdate())
+				if ('auto' == $this->type)
 				{
-					return $this->okay;
+					$build = 2;
 				}
+				// load the dropbox class
+				$this->dropbox = new Dropbox(###Component###Helper::getModel('local_listing', JPATH_COMPONENT_ADMINISTRATOR), $build);
+				// okay now update
+				$this->okay = $this->doUpdate();
 			}
+			// always reset if all okay
+			return $this->resetUpdate();
 		}
+		$this->setErrors('The update type is unknown.');
 		return false;
 	}
+	
+	/**
+	 *	set the exsternal source data
+	 */
+	protected function setExternalSourceData($id, $data = array())
+	{
+		// get the data if not set
+		if (!$this->data || !###Component###Helper::checkObject($this->data))
+		{
+			// load model to get the data
+			$model = ###Component###Helper::getModel('external_source', JPATH_COMPONENT_ADMINISTRATOR);
+			$this->data = $model->getItem($id);
+		}
+		// if new data is set load it
+		if (###Component###Helper::checkArray($data))
+		{
+			foreach ($data as $key => $value)
+			{
+				$this->data->$key = $value;
+			}
+		}				
+	}
 
 	/**
 	*	set update mehtod
 	**/
 	protected function setUpdateMethod()
 	{
-		$method = $this->app_params->get($this->type.'_link_update_method', 0);
+		if ($this->forceUpdate)
-		if ($this->runManual)
 		{
 			// this is a manual method
 			$this->updateMethod = 'manual';
 		}
-		elseif (2 == $method)
+		elseif (2 == $this->data->update_method)
-		{	
+		{
 			// this it an auto mehtod
 			$this->updateMethod = 'auto';
 		}
@@ -200,31 +257,55 @@ class Dropboxupdater
 	}
 	
 	/**
-	*	set update Links
+	*	set update target
 	**/
-	protected function setUpdateLinks()
+	protected function setUpdateTarget($nr)
 	{
-		// the number of links
+		// get target based on type and position
-		$numbers = range(1, 4);
+		if ('full' == $this->data->permissiontype && $nr > 0)
-		// now check if they are set
-		foreach ($numbers as $number)
 		{
-			// set the number to string
+			$position = $nr - 1;
-			$numStr = ###Component###Helper::safeString($number);
+			if (1 == $this->data->dropboxoptions && ###Component###Helper::checkJson($this->data->sharedurl))
-			// Get the url
-			$url = $this->app_params->get($this->type.'dropbox'.$numStr, null);
-			// only load those that are set
-			if ($url)
 			{
-				$this->updateLinks[] = $url;
+				$targets = json_decode($this->data->sharedurl)->tsharedurl;
+			}
+			elseif (2 == $this->data->dropboxoptions && ###Component###Helper::checkJson($this->data->folder))
+			{
+				$targets = json_decode($this->data->folder)->tfolder;
+			}
+			// check if we found any
+			if (!isset($targets[$position]) || !###Component###Helper::checkString($targets[$position]))
+			{
+				$this->setErrors('The target Shared-url or Folder is not set.');
+				$this->okay = false;
+			}
+			else
+			{
+				$this->updateTarget = $targets[$position];
 			}
 		}
-		// check if we found any
+		else
-		if (!isset($this->updateLinks) || !###Component###Helper::checkArray($this->updateLinks))
 		{
-			$this->okay = false;
+			$this->updateTarget = '';
 		}
 	}
+
+	/**
+	*	set the configeration for exsternal source class
+	**/
+	protected function setDetailsConfig()
+	{
+		// reset config
+		$this->detailsConfig = array();
+		// the source ID
+		$this->detailsConfig['sourceID'] = $this->data->id;
+		// get the legal files set
+		$this->detailsConfig['addTypes'] = $this->data->filetypes;
+		// set other config settings
+		$this->detailsConfig['dropboxOption'] = $this->data->dropboxoptions;
+		// set dropbox target
+		$this->detailsConfig['dropboxTarget'] = $this->updateTarget;
+	}
 	
 	/**
 	*	set next update time
@@ -243,7 +324,7 @@ class Dropboxupdater
 		else
 		{
 			// based on the auto time we will set the next update date/time
-			$timer = $this->app_params->get($this->type.'_dropbox_timer', '60');
+			$timer = $this->data->update_timer;
 			if ($timer != 0)
 			{
 				// Get Next Update Time
@@ -252,18 +333,19 @@ class Dropboxupdater
 			// if timer is 0 we should not update
 			else
 			{
+				$this->setErrors('The timer is not setup correctly.');
 				$this->okay = false;
 			}			
 		}
 	}
 	
 	/**
-	*	set update mehtod
+	*	set update info data
 	**/
-	protected function setInfoData()
+	protected function setUpdateInfoData()
 	{
 		// set the info file name
-		$fileName = md5($this->type.'info'.$this->localkey);
+		$fileName = md5($this->fileKey.'info');
 		// set file path
 		$this->infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json';
 		
@@ -289,11 +371,13 @@ class Dropboxupdater
 		if ($this->updateInfo->updateactive)
 		{
 			$this->okay = false;
+			$this->setErrors('There is an update already running.');
 		}
 		// check if the time has come to do the next update
 		elseif (('auto' == $this->updateMethod) && ($this->updateInfo->nextupdate > $this->today))
 		{
 			$this->okay = false;
+			$this->setErrors('It is not yet time to run this update.');
 		}
 		else
 		{
@@ -301,14 +385,6 @@ class Dropboxupdater
 		}
 	}
 
-	/**
-	*	save the update info
-	**/
-	protected function saveProgress()
-	{
-		return $this->saveJson(json_encode($this->progress),$this->progressFilePath);
-	}
-
 	/**
 	*	save the update info
 	**/
@@ -323,94 +399,33 @@ class Dropboxupdater
 	protected function doUpdate()
 	{
 		// we need more then the normal time to run this script 5 minutes at least.
-		ini_set('max_execution_time', 500);
+		ini_set('max_execution_time', $this->app_params->get('max_execution_time', 500));
-		// get data of all the urls
+		// get data of all the shared links of all target items
-		foreach ($this->updateLinks as $mainUrl)
+		if (!$this->dropbox->getFiles($this->data->oauthtoken, $this->data->permissiontype, $this->detailsConfig))
 		{
-			// set progress
+			$this->setErrors($this->dropbox->error_summary);
-			if ($this->progress['report'] < 60)
+			return false;
-			{
+		}		
-				$this->progress['report'] = $this->progress['report'] + 5;
+		// if this is a manual update, then revoke the token
-				$this->saveProgress();
+		if ($this->forceUpdate)
-			}
+		{
-			// get ldropbox links
+			$this->dropbox->revokeToken();
-			$dropbox = new Dropbox($mainUrl, $this->dropboxConfig);
-			// set progress
-			if ($this->progress['report'] < 70)
-			{
-				$this->progress['report'] = $this->progress['report'] + 5;
-				$this->saveProgress();
-			}
-			// get the links
-			if (###Component###Helper::checkArray($dropbox->files))
-			{
-				$this->listing = array_merge($this->listing, $dropbox->files);
-			}
-			// set progress
-			if ($this->progress['report'] < 80)
-			{
-				$this->progress['report'] = $this->progress['report'] + 5;
-				$this->saveProgress();
-			}
-			unset($dropbox);
 		}
-		
+		return true;
-		// now store the new listing
-		return $this->setNewListing();
 	}
 	
-	protected function setNewListing()
+	public function resetUpdate()
-	{		
-		// set progress
-		$this->progress['report'] = 100;
-		$this->saveProgress();
-		// reset storage
-		$storeage = array();
-		// set the listing file name
-		$fileName = md5($this->type.'listing'.$this->localkey);
-		// set file path
-		$listingFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json';
-		
-		// now store the new listing
-		if (###Component###Helper::checkArray($this->listing))
-		{			
-			// encrypt the urls
-			$locker = new FOFEncryptAes($this->localkey, 256);
-			foreach ($this->listing as $folder => $link)
-			{
-				$storeage[$folder] = base64_encode($locker->encryptString($link));
-			}
-		}
-		else
-		{
-			$this->okay = false;
-		}
-		// save the update links.
-		$this->saveJson(json_encode($storeage),$listingFilePath);
-		// make sure the update reset
-		$this->updateInfo->nextupdate = $this->next;
-		$this->updateInfo->updateactive = false;
-		$this->updateInfo->updatenow = false;
-				
-		return $this->saveUpdateInfo();
-	}
-
-	/**
-	*	set the configeration for dropbox class
-	**/
-	protected function setDropboxConfig()
 	{
-		// reset config
+		if ($this->okay || (isset($this->dropbox->forceReset) && $this->dropbox->forceReset))
-		$this->dropboxConfig = array();
-		// get the legal files set
-		$getfiles = $this->app_params->get('dropbox_filetypes', null);
-		if (###Component###Helper::checkArray($getfiles))
 		{
-			$this->dropboxConfig['get'] = $getfiles;
+			// make sure the update reset
+			$this->updateInfo->nextupdate = $this->next;
+			$this->updateInfo->updateactive = false;
+			$this->updateInfo->updatenow = false;
+			// store final update
+			$this->saveUpdateInfo();
 		}
-		// set other config settings
+		return $this->okay;
-		$this->dropboxConfig['save'] = false;
-		$this->dropboxConfig['download'] = false;
 	}
 
 	protected function saveJson($data,$filename)

admin/helpers/compiler.php

@@ -43,7 +43,7 @@ class Compiler extends Infusion
 	
 	public $filepath		= '';
 	// fixed pathes
-	protected $add2SalesServer	= false;
+	protected $dynamicIntegration	= false;
 	protected $backupPath		= false;
 	protected $gitPath		= false;
 
@@ -61,8 +61,8 @@ class Compiler extends Infusion
 			// set some folder paths in relation to distribution
 			if ($config['addBackup'])
 			{
-				$this->backupPath	= $this->params->get('backup_folder_path', $this->tempPath).'/'.$this->componentBackupName.'.zip';
+				$this->backupPath		= $this->params->get('backup_folder_path', $this->tempPath).'/'.$this->componentBackupName.'.zip';
-				$this->add2SalesServer	= true;
+				$this->dynamicIntegration	= true;
 			}
 			if ($config['addGit'])
 			{
@@ -173,16 +173,21 @@ class Compiler extends Infusion
 				}
 			}
 			// do a final run to update the readme file
+			$two = 0;
 			foreach ($this->newFiles['static'] as $static)
 			{
 				if (('README.md' == $static['name'] || 'README.txt' == $static['name']) && $this->componentData->addreadme && JFile::exists($static['path']))
 				{
 					$this->buildReadMe($static['path']);
+					$two++;
+				}
+				if ($two == 2)
+				{
 					break;
 				}
 			}
 			// move the update server to host
-			if ($this->componentData->add_update_server && isset($this->updateServerFileName) && $this->add2SalesServer)
+			if ($this->componentData->add_update_server && $this->componentData->update_server_target == 1 && isset($this->updateServerFileName) && $this->dynamicIntegration)
 			{
 				$xml_update_server_path = $this->componentPath.'/'.$this->updateServerFileName.'.xml';
 				// make sure we have the correct file
@@ -324,12 +329,12 @@ class Compiler extends Infusion
 		if ($zip->create($this->filepath, $zipArray))
 		{
 			// now move to backup if zip was made and backup is requered
-			if ($this->backupPath)
+			if ($this->backupPath && $this->dynamicIntegration)
 			{
 				JFile::copy($this->filepath, $this->backupPath);
 			}
 			// move to sales server host
-			if ($this->componentData->add_sales_server)
+			if ($this->componentData->add_sales_server && $this->dynamicIntegration)
 			{
 				// make sure we have the correct file
 				if (isset($this->componentData->sales_server_ftp))

admin/helpers/compiler/a_Get.php

@@ -681,6 +681,16 @@ class Get
 			$this->customScriptBuilder['component_php_admin_event'] = '';
 		}
 		unset($component->php_admin_event);
+		// add_php_helper_both
+		if ($component->add_php_helper_both == 1)
+		{
+			$this->lang = 'both';
+			$this->customScriptBuilder['component_php_helper_both'] = "\n\n".$this->setCustomContentLang(base64_decode($component->php_helper_both));
+		}
+		else
+		{
+			$this->customScriptBuilder['component_php_helper_both'] = '';
+		}
 		// add_php_helper_site
 		if ($component->add_php_helper_site == 1)
 		{
@@ -2421,7 +2431,7 @@ class Get
 	 * @return  string The unique localkey
 	 * 
 	 */
-	public function uniquekey($size, $random = false)
+	public function uniquekey($size, $random = false, $newBag = "vvvvvvvvvvvvvvvvvvv")
 	{
 		if ($random)
 		{
@@ -2429,7 +2439,7 @@ class Get
 		}
 		else
 		{
-			$bag = "vvvvvvvvvvvvvvvvvvv";
+			$bag = $newBag;
 		}
 		$key = array();
 		$bagsize = strlen($bag) - 1;

admin/helpers/compiler/f_Infusion.php

@@ -153,6 +153,9 @@ class Infusion extends Interpretation
 			// ###CUSTOM_HELPER_SCRIPT###
 			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_admin']);
 			
+			// ###BOTH_CUSTOM_HELPER_SCRIPT###
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_both']);
+			
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
 			
@@ -249,8 +252,8 @@ class Infusion extends Interpretation
                                         $this->placeholders['###View###'] = $viewName_f;
 
                                         // set license per view if needed
-                                        $this->setLockLicensePer($viewName_single);
+                                        $this->setLockLicensePer($viewName_single, $this->target);
-                                        $this->setLockLicensePer($viewName_list);
+                                        $this->setLockLicensePer($viewName_list, $this->target);
 
                                         // ###FIELDSETS### <<<DYNAMIC>>>
                                         $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
@@ -607,7 +610,7 @@ class Infusion extends Interpretation
                                         $this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE;
 
                                         // set license per view if needed
-                                        $this->setLockLicensePer($view['settings']->code);
+                                        $this->setLockLicensePer($view['settings']->code, $this->target);
 
                                         if ($view['settings']->main_get->gettype == 1)
                                         {
@@ -854,7 +857,7 @@ class Infusion extends Interpretation
 					$this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE;
 						
 					// set license per view if needed
-					$this->setLockLicensePer($view['settings']->code);
+					$this->setLockLicensePer($view['settings']->code, $this->target);
 					
 					// set the site default view
 					if ($view['default_view'] == 1)
@@ -871,11 +874,13 @@ class Infusion extends Interpretation
 					// 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_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code, $view);
 					$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
 					
 					if ($view['settings']->main_get->gettype == 1)
 					{
+						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 1);
 						// 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]))
 						{
@@ -910,7 +915,9 @@ class Infusion extends Interpretation
 						}
 					}
 					elseif ($view['settings']->main_get->gettype == 2)
-					{						
+					{
+						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 2);					
 						// ###SITE_GET_LIST_QUERY### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
 

admin/helpers/componentbuilder.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -33,23 +33,114 @@ abstract class ComponentbuilderHelper
 { 
 
 	/*
-	 * Compiler autoloader
+	 * Autoloader
 	 */
-	public static function autoLoader()
+	public static function autoLoader($type = 'compiler')
 	{
 		// load the compiler classes
-		foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/compiler/*.php") as $compilerFile)
+		foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/".$type."/*.php") as $autoFile)
 		{
-			require_once $compilerFile;
+			require_once $autoFile;
 		}
-		// import the Joomla librarys
+		// load only if compiler
-		jimport('joomla.filesystem.file');
+		if ('compiler' == $type)
-		jimport('joomla.filesystem.folder');
+		{
-		jimport('joomla.filesystem.archive');
+			// import the Joomla librarys
-		jimport('joomla.application.component.modellist');
+			jimport('joomla.filesystem.file');
+			jimport('joomla.filesystem.folder');
+			jimport('joomla.filesystem.archive');
+			jimport('joomla.application.component.modellist');
+			// include class to minify js
+			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php';
+		}
+		// load this for all
 		jimport('joomla.application');
-		// include class to minify js
+	}
-		require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php';
+
+	/**
+	* 	The dynamic builder of views, tables and fields
+	**/
+	public static function dynamicBuilder(&$data, $type)
+	{
+		self::autoLoader('extrusion');
+		$extruder = new Extrusion($data);
+	}
+
+	/**
+	* 	The user notice info File Name
+	**/
+	protected static $usernotice = false;
+	
+	public static function getFilePath($type, $name = 'listing', $key = '', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE)
+	{
+		if (!self::checkString(self::${$type.$name}))
+		{
+			// Get local key
+			$localkey = self::getLocalKey();
+			// set the name
+			$fileName = md5($type.$name.$localkey.$key);
+			// set file path			
+			self::${$type.$name} = $PATH.'/helpers/'.$fileName.$fileType;
+		}
+		// return the path
+		return self::${$type.$name};
+	}
+	
+	public static function getFieldOptions($value, $type, $settings = array())
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		 
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('properties', 'short_description', 'description')));
+		$query->from($db->quoteName('#__componentbuilder_fieldtype'));
+		$query->where($db->quoteName('published') . ' = 1');
+		$query->where($db->quoteName($type) . ' = '. $value);
+		 
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{
+			$result = $db->loadObject();
+			$properties = json_decode($result->properties,true);
+			$pointer = 0;
+			$field = array('values' => "<field ", 'values_description' => '<ul>', 'short_description' => $result->short_description, 'description' => $result->description);
+			foreach ($properties['name'] as $line)
+			{
+				$field['values_description'] .= '<li><b>'.$properties['name'][$pointer].'</b> '.$properties['description'][$pointer].'</li>';
+				if(isset($settings[$properties['name'][$pointer]]))
+				{
+					$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$settings[$properties['name'][$pointer]].'" ';
+				}
+				else
+				{
+					$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$properties['example'][$pointer].'" ';
+				}
+				$pointer++;
+			}
+			$field['values'] .= "\n/>";
+			$field['values_description'] .= '</ul>';
+			// return found field options
+			return $field;
+		}
+		return false;
+	}
+
+	/**
+	* 	get the localkey
+	**/
+	protected static $localkey = false;
+	
+	public static function getLocalKey()
+	{
+		if (!self::$localkey)
+		{
+			// get the main key
+			self::$localkey = md5(JComponentHelper::getParams('com_componentbuilder')->get('basic_key', 'localKey34fdWEkl'));
+		}
+		return self::$localkey;
 	}
 
 	/**
@@ -187,7 +278,7 @@ abstract class ComponentbuilderHelper
 			return true;
 		}
 		return false;		
-	}
+	} 
 	/**
 	*	Load the Component xml manifest.
 	**/
@@ -819,7 +910,7 @@ abstract class ComponentbuilderHelper
 			{
 				// The record has been set. Check the record permissions.
 				$permission = $user->authorise($action->name, 'com_componentbuilder.'.$view.'.' . (int) $record->id);
-				if (!$permission && !is_null($permission))
+				if (!$permission) // TODO removed && !is_null($permission)
 				{
 					if ($action->name == 'core.edit' || $action->name == $view.'.edit')
 					{
@@ -1154,10 +1245,22 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
-	public static function checkArray($array)
+	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
 		{
+			// also make sure the empty strings are removed
+			if ($removeEmptyString)
+			{
+				foreach ($array as $key => $string)
+				{
+					if (empty($string))
+					{
+						unset($array[$key]);
+					}
+				}
+				return self::checkArray($array, false);
+			}
 			return true;
 		}
 		return false;
@@ -1430,13 +1533,13 @@ abstract class ComponentbuilderHelper
 		return implode($key);
 	}
 
-	public static function getCryptKey($type)
+	public static function getCryptKey($type, $default = null)
 	{
 		if ('basic' == $type)
 		{
 			// Get the global params
 			$params = JComponentHelper::getParams('com_componentbuilder', true);
-			$basic_key = $params->get('basic_key', null);
+			$basic_key = $params->get('basic_key', $default);
 			if ($basic_key)
 			{
 				return $basic_key;

admin/helpers/extrusion/a_mapping.php

@@ -0,0 +1,389 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version			1.0.0
+	@created		26th December, 2016
+	@package		Component Builder
+	@subpackage		mapping.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');
+
+/**
+ * Mapping class
+ */
+class Mapping
+{
+	/**
+	 *	Some default fields
+	 */
+	protected	$buildcompsql;
+	public		$id;
+	public		$name_code;
+	public		$addadmin_views;
+	public		$addSql = array();
+	public		$source = array();
+	public		$sql = array();
+	
+	/**
+	 *	The map of the needed fields and views
+	 */
+	public $map;
+	
+	/**
+	 *	The app to load messages mostly
+	 */
+	public $app;
+	
+	/**
+	 *	The needed set of keys needed to set
+	 */
+	protected $setting = array('id' => 'default', 'buildcompsql' => 'base64', 'addadmin_views' => 'json', 'name_code' => 'safeString');
+	
+	/**
+	 *	The needed set of keys needed to set
+	 */
+	protected $notRequiered = array('id', 'asset_id', 'published', 
+					'created_by', 'modified_by', 'created', 'modified', 'checked_out','checked_out_time',
+					'version', 'hits', 'access', 'ordering', 
+					'metakey', 'metadesc', 'metadata', 'params');
+	
+	/**
+	 *	The datatypes and it linked field types (basic)
+	 *	(TODO) We may need to set this dynamicly
+	 */
+	protected $dataTypes = array(	'CHAR' => 'Text', 'VARCHAR' => 'Text',
+					'TEXT' => 'Textarea', 'MEDIUMTEXT' => 'Textarea', 
+					'LONGTEXT'  => 'Textarea', 'DATE' => 'Text', 'TIME' => 'Text',
+					'DATETIME' => 'Calendar', 'INT' => 'Text', 'TINYINT' => 'Text',
+					'BIGINT' => 'Text', 'FLOAT' => 'Text', 'DECIMAL' => 'Text',
+					'DOUBLE' => 'Text');
+	
+	/**
+	 *	The datasize identifiers
+	 */
+	protected $dataSize = array(	'CHAR', 'VARCHAR', 'INT', 'TINYINT',
+					'BIGINT', 'FLOAT', 'DECIMAL', 'DOUBLE');
+	
+	/**
+	 *	The default identifiers
+	 */
+	protected $defaults = array(0, 1, "CURRENT_TIMESTAMP", "DATETIME"); // Other
+	
+	/**
+	 *	The sizes identifiers
+	 */
+	protected $sizes = array("1", "7", "10", "11", "50", "64", "100", "255", "1024", "2048"); // Other
+
+	
+	/**
+	 *	Constructor
+	 */
+	public function __construct($data = false)
+	{
+		// set the app to insure messages can be set
+		$this->app = JFactory::getApplication();
+		
+		if ($data)
+		{
+			if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql']))
+			{
+				foreach ($data as $key => $value)
+				{
+					if (isset($this->setting[$key]))
+					{
+						switch($this->setting[$key])
+						{
+							case 'base64':
+								// set needed value
+								$this->$key = base64_decode($value);
+								break;
+							case 'json':
+								// set needed value
+								$this->$key = json_decode($value, true);
+								break;
+							case 'safeString':
+								// set needed value
+								$this->$key = ComponentbuilderHelper::safeString($value);
+								break;
+							default :
+								$this->$key = $value;
+								break;
+						}
+					}
+				}
+				// set the map of the views needed
+				if ($this->setMap())
+				{
+					return true;
+				}
+				$this->app->enqueueMessage(
+					JText::_('No "CREATE TABLE.." were found, please check your sql.'),
+					'Error'
+				);
+				return false;
+			}
+			return false; // not set so just return without any error
+		}
+		$this->app->enqueueMessage(
+			JText::_('Could not find the data needed to continue.'),
+			'Error'
+		);
+		return false;
+	}
+	
+	/**
+	 *	The mapping function
+	 *	To Map the views and fields that are needed
+	 */
+	protected function setMap()
+	{
+		// start parsing the sql dump data
+		$queries = JDatabaseDriver::splitSql($this->buildcompsql);
+		if (ComponentbuilderHelper::checkArray($queries))
+		{
+			foreach ($queries as $query)
+			{
+				// only use create table queries
+				if (strpos($query, 'CREATE TABLE IF NOT EXISTS `') !== false)
+				{
+					if ($tableName = $this->getTableName($query))
+					{
+						// now get the fields/columns of this view/table
+						if ($fields = $this->getFields($query))
+						{
+							// make sure it is all lower case from here on
+							$tableName = strtolower($tableName);
+							$this->map[$tableName] = $fields;
+						}
+					}
+					else
+					{
+						continue;
+					}
+				}
+				// get the insert data if set
+				if (strpos($query, 'INSERT INTO `') !== false)
+				{					
+					if ($tableName = $this->getTableName($query))
+					{
+						$this->addSql[$tableName] = 1;
+						$this->source[$tableName] = 2;
+						$this->sql[$tableName] = $query;
+					}
+				}
+			}
+			// check if the mapping was done
+			if (ComponentbuilderHelper::checkArray($this->map))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 *	Get the table name
+	 */
+	protected function getTableName(&$query)
+	{
+		$tableName = ComponentbuilderHelper::getBetween($query, '`#__', "`");
+		// if it still was not found
+		if (!ComponentbuilderHelper::checkString($tableName))
+		{
+			// skip this query
+			return false;
+		}
+		// clean the table name (so only view name remain)
+		if (strpos($tableName, $this->name_code) !== false)
+		{
+			$tableName = trim(str_replace($this->name_code, '', $tableName), '_');
+		}
+		// if found
+		if (ComponentbuilderHelper::checkString($tableName))
+		{
+			return $tableName;
+		}
+		// skip this query
+		return false;
+	}
+	
+	/**
+	 *	Get the field details
+	 */
+	protected function getFields(&$query)
+	{	
+		$rows = array_map('trim', explode("\n", $query));
+		$fields = array();
+		foreach ($rows as $row)
+		{
+			// make sure we have a lower case string
+			$row = strtoupper($row);
+			$field = array();
+			$name = '';
+			if (0 === strpos($row, '`'))
+			{
+				// get field name
+				$name = ComponentbuilderHelper::getBetween($row, '`', '`');
+			}
+			if (0 === strpos($row, "'"))
+			{
+				// get field name
+				$name = ComponentbuilderHelper::getBetween($row, "'", "'");
+			}
+			// check if the name was found
+			if (ComponentbuilderHelper::checkString($name))
+			{
+				// insure we have the name in lower case from here on
+				$name = strtolower($name);
+				// only continue if field is requered
+				if (in_array($name, $this->notRequiered))
+				{
+					continue;
+				}
+				// check if the field type is found
+				if ($fieldType = $this->getType($row, $field, $name))
+				{
+					$field['row']		= $row;
+					$field['name']		= $name;
+					$field['label']		= ComponentbuilderHelper::safeString($name, 'W');
+					$field['fieldType']	= $fieldType;
+					$field['size']		= $this->getSize($row, $field);
+					$field['sizeOther']	= '';
+					if (!in_array($field['size'], $this->sizes))
+					{
+						if (ComponentbuilderHelper::checkString($field['size']))
+						{
+							$field['sizeOther'] = $field['size'];
+							$field['size'] = 'Other';
+						}
+					}
+					$field['default']	= $this->getDefault($row);
+					$field['defaultOther']	= '';
+					if (!in_array($field['default'], $this->defaults))
+					{
+						if (ComponentbuilderHelper::checkString($field['default']))
+						{
+							$field['defaultOther'] = $field['default'];
+							$field['default'] = 'Other';
+						}
+					}
+					$field['null']		= $this->getNullValue($row, $field);
+					// check if field is a key
+					$field['key']		= $this->getKeyStatus($rows, $name);
+					// load to fields
+					$fields[] = $field;
+				}
+			}
+		}
+		if (ComponentbuilderHelper::checkArray($fields))
+		{
+			return $fields;
+		}
+		return false;
+	}
+	
+	/**
+	 *	Get the field types
+	 */
+	protected function getType($row, &$field, &$name)
+	{
+		// first remove field name
+		$row = str_replace($name, '', $row);
+		// get the data type first
+		foreach ($this->dataTypes as $type => $fieldType)
+		{
+			if (strpos($row, $type) !== false)
+			{
+				$field['dataType'] = $type;
+				return $fieldType;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 *	Get the field size
+	 */
+	protected function getSize(&$row, $field)
+	{
+		if (in_array($field['dataType'], $this->dataSize))
+		{
+			return ComponentbuilderHelper::getBetween($row, $field['dataType'].'(', ')');
+		}
+		return '';
+	}
+	
+	/**
+	 *	Get the field default
+	 */
+	protected function getDefault(&$row)
+	{
+		// get default value
+		if (strpos($row, 'DEFAULT "') !== false) // to sure it this is correct...
+		{
+			return ComponentbuilderHelper::getBetween($row, 'DEFAULT "', '"');
+		}
+		// get default value
+		if (strpos($row, "DEFAULT '") !== false)
+		{
+			return ComponentbuilderHelper::getBetween($row, "DEFAULT '", "'");
+		}
+		return '';
+	}
+	
+	/**
+	 *	Get the field Null Value
+	 */
+	protected function getNullValue(&$row, &$field)
+	{
+		// get the result of null
+		if (strpos($row, 'NOT NULL') !== false)
+		{
+			return 'NOT NULL';
+		}
+		if (strpos($row, 'DEFAULT NULL') !== false)
+		{
+			$field['default'] = 'NULL';
+			return '';
+		}
+		return 'NULL';
+	}
+	
+	/**
+	 *	Get the field key status
+	 */
+	protected function getKeyStatus(&$rows, &$name)
+	{
+		// get the data type first
+		foreach ($rows as $row)
+		{
+			if (strpos($row, 'UNIQUE KEY ') !== false && stripos($row, $name) !== false)
+			{
+				return 1;
+			}
+			if ((strpos($row, 'PRIMARY KEY ') !== false && stripos($row, $name) !== false) || (strpos($row, 'KEY ') !== false && stripos($row, $name) !== false))
+			{
+				return 2;
+			}
+		}
+		return 0;
+	}
+}

admin/helpers/extrusion/b_builder.php

@@ -0,0 +1,294 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version			1.0.0
+	@created		26th December, 2016
+	@package		Component Builder
+	@subpackage		builder.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');
+
+/**
+ * Builder class
+ */
+class Builder extends Mapping
+{
+	/**
+	 *	Some default fields
+	 */
+	public		$user;
+	public		$today;
+	public		$db;
+	public		$views		= array();
+	protected	$fields		= array();
+	protected	$title		= array();
+	protected	$description	= array();
+	protected	$alias		= array();
+	protected	$list		= array();
+	
+	/**
+	 *	Field that should not be used in name, alias, disc, and list view
+	 *	(TODO) We may need to set this dynamicly
+	 */
+	protected	$avoidList	= array('not_required');
+	
+	/***
+	 *	Constructor
+	 */
+	public function __construct(&$data)
+	{
+		// first we run the perent constructor
+		if (parent::__construct($data))
+		{
+			// always reset the building values if found
+			$data['buildcomp'] = 0;
+			$data['buildcompsql'] = '';
+			// set some globals
+			$this->db	= JFactory::getDbo();
+			$this->user	= JFactory::getUser();
+			$this->today	= JFactory::getDate()->toSql();
+			
+			// no start the building of the views and fields
+			if ($this->setBuild())
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 *	The building function
+	 *	To build the views and fields that are needed
+	 */
+	protected function setBuild()
+	{
+		foreach ($this->map as $view => $fields)
+		{
+			// set this field with all its needed data
+			foreach ($fields as $field)
+			{
+				$this->setField($view, $field);
+			}
+			// set this view with all its needed data
+			$this->setView($view);
+		}
+		return true;
+	}
+	
+	/**
+	 *	The building function for views
+	 */
+	protected function setView(&$name)
+	{
+		// set the view object
+		$object				= new stdClass();
+		$object->system_name		= ComponentbuilderHelper::safeString($name, 'W') . ' (dynamic build)';
+		$object->name_single		= $name;
+		$object->name_list		= $name. 's';
+		$object->short_description	= $name. ' view (dynamic build)';
+		$object->type			= 1;
+		$object->description		= $name. ' view (dynamic build)';
+		$object->add_fadein		= 1;
+		$object->add_sql		= (isset($this->addSql[$name])) ? $this->addSql[$name]: 0;
+		$object->source			= (isset($this->source[$name])) ? $this->source[$name]: 0;
+		$object->sql			= (isset($this->sql[$name])) ? base64_encode($this->sql[$name]): '';
+		$object->addpermissions		= '{"action":["view.edit","view.edit.own","view.edit.state","view.create","view.delete","view.access"],"implementation":["3","3","3","3","3","3"]}';
+		$object->addfields		= $this->addFields($name);
+		$object->created		= $this->today;
+		$object->created_by		= $this->user->id;
+		$object->published		= 1;
+		// add to data base
+		if ($this->db->insertObject('#__componentbuilder_admin_view', $object))
+		{
+			// make sure the access of asset is set
+			$id = $this->db->insertid();
+			ComponentbuilderHelper::setAsset($id, 'admin_view');
+			// load the views
+			$this->views[] = $id;
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 *	Add the fields to the view
+	 */
+	protected function addFields(&$view)
+	{
+		if (isset($this->fields[$view]))
+		{
+			// set some defaults
+			$addField = array (
+				'field'		=> array(),
+				'list'		=> array(),
+				'order_list'	=> array(),
+				'title'		=> array(),
+				'alias'		=> array(),
+				'sort'		=> array(),
+				'search'	=> array(),
+				'filter'	=> array(),
+				'link'		=> array(),
+				'tab'		=> array(),
+				'alignment'	=> array(),
+				'order_edit'	=> array(),
+				'permission'	=> array()
+			);
+			$fixLink = (isset($this->title[$view])) ? 0 : 1;
+			// build the field data... hmmm
+			foreach ($this->fields[$view] as $nr => $id)
+			{
+				$alignment = 1;
+				if ($nr % 2 == 0)
+				{
+					$alignment = 2;
+				}
+				// some defaults
+				$isTitle = (isset($this->title[$view]) && $this->title[$view] == $id) ? 1 : 0;
+				$isAlias = (isset($this->alias[$view]) && $this->alias[$view] == $id) ? 1 : 0;
+				$isList = ($key = array_search($id, $this->list[$view])) ? 1 : 0;
+				$isLink = ($isTitle) ? 1 : (($isList && $fixLink) ? 1 : 0);
+				if ($isLink)
+				{
+					$fixLink = 0;
+				}
+				// load the field values
+				$addField['field'][]		= $id;
+				$addField['list'][]		= $isList;
+				$addField['order_list'][]	= ($key) ? $key : 0;
+				$addField['title'][]		= $isTitle;
+				$addField['alias'][]		= $isAlias;
+				$addField['sort'][]		= $isList;
+				$addField['search'][]		= $isList;
+				$addField['filter'][]		= $isList;
+				$addField['link'][]		= $isLink;
+				$addField['tab'][]		= 1;
+				$addField['alignment'][]	= ($isTitle || $isAlias) ? 4 : $alignment;
+				$addField['order_edit'][]	= $nr;
+				$addField['permission'][]	= 0;
+			}
+			return json_encode($addField);
+		}
+		return '';
+	}
+	
+	/**
+	 *	The building function for fields
+	 */
+	protected function setField(&$view, &$field)
+	{
+		if ($fieldType = $this->getFieldType($field['fieldType']))
+		{
+			// set the field object
+			$object				= new stdClass();
+			$object->name			= $field['label'] . ' (dynamic build)';
+			$object->fieldtype		= $fieldType;
+			$object->datatype		= $field['dataType'];
+			$object->indexes		= $field['key'];
+			$object->null_switch		= $field['null'];
+			$object->datalenght		= $field['size'];
+			$object->datalenght_other	= $field['sizeOther'];
+			$object->datadefault		= $field['default'];
+			$object->datadefault_other	= $field['defaultOther'];
+			$object->created		= $this->today;
+			$object->created_by		= $this->user->id;
+			$object->published		= 1;
+			$object->store			= 0;
+			$object->xml			= $this->setFieldXML($field, $fieldType);
+			// add to data base
+			if ($this->db->insertObject('#__componentbuilder_field', $object))
+			{
+				// make sure the access of asset is set
+				$id = $this->db->insertid();
+				ComponentbuilderHelper::setAsset($id, 'field');
+				// check if any field for this field was already set, if not set array
+				if (!isset($this->fields[$view]))
+				{
+					$this->fields[$view] = array();
+				}
+				// load the field
+				$this->fields[$view][] = $id;
+				
+				if (!isset($this->list[$view]))
+				{
+					$this->list[$view] = array();
+				}
+				// insure that some fields are avoided
+				if (!in_array($field['name'], $this->avoidList))
+				{
+					// set the name/title field if found
+					if (!isset($this->title[$view]) && (stripos($field['name'], 'name') !== false || stripos($field['name'], 'title') !== false))
+					{
+						$this->title[$view] = $id;
+						$this->list[$view][] = $id;
+					}
+					// set the alias field if found
+					elseif (!isset($this->alias[$id]) && stripos($field['name'], 'alias') !== false)
+					{
+						$this->alias[$view] = $id;
+					}
+					// set the alias field if found
+					elseif (!isset($this->description[$id]) && stripos($field['name'], 'desc') !== false)
+					{
+						$this->description[$view] = $id;
+						$this->list[$view][] = $id;
+					}
+					elseif ('Text' == $field['fieldType'] && count($this->list[$view]) < 5)
+					{
+						$this->list[$view][] = $id;
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 *	get the field type id from system
+	 */
+	protected function getFieldType($fieldName)
+	{
+		// load the field settings
+		return ComponentbuilderHelper::getVar('fieldtype', $fieldName, 'name', 'id');
+	}
+	
+	/**
+	 *	The building function for field xml
+	 */
+	protected function setFieldXML(&$field, $fieldId)
+	{
+		// load the field settings
+		$settings			= array();
+		$settings['name']		= $field['name'];
+		$settings['description']	= 'The '.strtolower($field['label']) . ' is set here.';
+		$settings['message']		= "Error! Please add some ".strtolower($field['label'])." here.";
+		$settings['label']		= $field['label'];
+		$settings['default']		= ($field['default'] == 'Other') ? $field['defaultOther'] : $field['default'];
+		$settings['hint']		= $field['label'] .' Here!';
+		// okay set the xml field values
+		if ($fieldOptions = ComponentbuilderHelper::getFieldOptions($fieldId, 'id', $settings))
+		{
+			return json_encode($fieldOptions['values']);
+		}
+		return '';
+	}
+}

admin/helpers/extrusion/c_extrusion.php

@@ -0,0 +1,141 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version			1.0.0
+	@created		26th December, 2016
+	@package		Component Builder
+	@subpackage		extrusion.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');
+
+/**
+ * Extrusion class
+ */
+class Extrusion extends Builder
+{
+	/***
+	 * Constructor
+	 */
+	public function __construct(&$data)
+	{
+		// first we run the perent constructor
+		if (parent::__construct($data))
+		{
+			// link the view data to the component
+			$data['addadmin_views'] = $this->linkAdminViews();
+			if (ComponentbuilderHelper::checkJson($data['addadmin_views']))
+			{
+				$this->app->enqueueMessage(
+					JText::_('All the fields and views from your sql dump has been created and linked to this component.'),
+					'Success'
+				);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 *	link the build views to the component
+	 */
+	protected function linkAdminViews()
+	{
+		// check if views were set
+		if (ComponentbuilderHelper::checkArray($this->views))
+		{
+			// insure arrays are set
+			if (!isset($this->addadmin_views['adminview']))
+			{
+				$this->addadmin_views['adminview'] = array();
+			}
+			if (!isset($this->addadmin_views['icomoon']))
+			{
+				$this->addadmin_views['icomoon'] = array();
+			}
+			if (!isset($this->addadmin_views['mainmenu']))
+			{
+				$this->addadmin_views['mainmenu'] = array();
+			}
+			if (!isset($this->addadmin_views['dashboard_add']))
+			{
+				$this->addadmin_views['dashboard_add'] = array();
+			}
+			if (!isset($this->addadmin_views['dashboard_list']))
+			{
+				$this->addadmin_views['dashboard_list'] = array();
+			}
+			if (!isset($this->addadmin_views['submenu']))
+			{
+				$this->addadmin_views['submenu'] = array();
+			}
+			if (!isset($this->addadmin_views['checkin']))
+			{
+				$this->addadmin_views['checkin'] = array();
+			}
+			if (!isset($this->addadmin_views['history']))
+			{
+				$this->addadmin_views['history'] = array();
+			}
+			if (!isset($this->addadmin_views['metadata']))
+			{
+				$this->addadmin_views['metadata'] = array();
+			}
+			if (!isset($this->addadmin_views['access']))
+			{
+				$this->addadmin_views['access'] = array();
+			}
+			if (!isset($this->addadmin_views['port']))
+			{
+				$this->addadmin_views['port'] = array();
+			}
+			if (!isset($this->addadmin_views['edit_create_site_view']))
+			{
+				$this->addadmin_views['edit_create_site_view'] = array();
+			}
+			if (!isset($this->addadmin_views['order']))
+			{
+				$this->addadmin_views['order'] = array();
+			}
+			// set the admin view data linking
+			foreach ($this->views as $id)
+			{
+				$this->addadmin_views['adminview'][] = $id;
+				$this->addadmin_views['icomoon'][] = 'joomla';
+				$this->addadmin_views['mainmenu'][] = 1;
+				$this->addadmin_views['dashboard_add'][] = 1;
+				$this->addadmin_views['dashboard_list'][] = 1;
+				$this->addadmin_views['submenu'][] = 1;
+				$this->addadmin_views['checkin'][] = 1;
+				$this->addadmin_views['history'][] = 1;
+				$this->addadmin_views['metadata'][] = 1;
+				$this->addadmin_views['access'][] = 1;
+				$this->addadmin_views['port'][] = 1;
+				$this->addadmin_views['edit_create_site_view'][] = 0;
+				$this->addadmin_views['order'][] = count($this->addadmin_views['order']) + 1;
+			}
+		}
+		if (isset($this->addadmin_views) && ComponentbuilderHelper::checkArray($this->addadmin_views))
+		{
+			return json_encode($this->addadmin_views);
+		}
+		return '';
+	}	
+}

admin/helpers/extrusion/index.html

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

admin/helpers/html/batch_.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/helpers/indenter.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/helpers/js.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/helpers/minify.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

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

@@ -53,22 +53,28 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS="Addconditions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_DESCRIPTION="Conditional setup for the above fields."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_LABEL="Conditions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS="Addfields"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_DESCRIPTION="Setup fields for this view."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_LABEL="Fields"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDFIELDS_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS="Addlinked Views"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION="Setup the linked views for this view."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL="Linked Views"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL="Add New Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS="Addpermissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION="Set permissions for this view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL="Permissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDRESS="Address"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES="Addtables"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL="Tables"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS="Addtabs"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION="Setup tabs for this view."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL="Tabs"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views"
@@ -126,6 +132,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW="Adminview"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION="Select an admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL="View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT="Ajax Input"
+COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_LABEL="Ajax Input"
 COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_DESCRIPTION="Select if the field is the alias field."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_LABEL="Alias"
@@ -218,6 +225,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard"
@@ -699,22 +707,29 @@ COM_COMPONENTBUILDER_COMPONENT_ACCESS_DESCRIPTION="Select if this view should us
 COM_COMPONENTBUILDER_COMPONENT_ACCESS_LABEL="Add Access"
 COM_COMPONENTBUILDER_COMPONENT_ADDADMIN_VIEWS="Addadmin Views"
 COM_COMPONENTBUILDER_COMPONENT_ADDADMIN_VIEWS_DESCRIPTION="Setup the admin views for this component."
+COM_COMPONENTBUILDER_COMPONENT_ADDADMIN_VIEWS_LABEL="Admin Views"
 COM_COMPONENTBUILDER_COMPONENT_ADDADMIN_VIEWS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONFIG="Addconfig"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONFIG_DESCRIPTION="Setup config fields."
+COM_COMPONENTBUILDER_COMPONENT_ADDCONFIG_LABEL="Config"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONFIG_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONTRIBUTORS="Addcontributors"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONTRIBUTORS_DESCRIPTION="Setup contributors for the component."
+COM_COMPONENTBUILDER_COMPONENT_ADDCONTRIBUTORS_LABEL="Contributors"
 COM_COMPONENTBUILDER_COMPONENT_ADDCONTRIBUTORS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOMMENUS="Addcustommenus"
+COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOMMENUS_LABEL="Custom Admin Menus"
 COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOMMENUS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOM_ADMIN_VIEWS="Addcustom Admin Views"
+COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOM_ADMIN_VIEWS_LABEL="Custom Admin Views"
 COM_COMPONENTBUILDER_COMPONENT_ADDCUSTOM_ADMIN_VIEWS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDFILES="Addfiles"
 COM_COMPONENTBUILDER_COMPONENT_ADDFILES_DESCRIPTION="Add custom files to this component."
+COM_COMPONENTBUILDER_COMPONENT_ADDFILES_LABEL="Files"
 COM_COMPONENTBUILDER_COMPONENT_ADDFILES_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDFOLDERS="Addfolders"
 COM_COMPONENTBUILDER_COMPONENT_ADDFOLDERS_DESCRIPTION="Add custom folder to this component."
+COM_COMPONENTBUILDER_COMPONENT_ADDFOLDERS_LABEL="Folder"
 COM_COMPONENTBUILDER_COMPONENT_ADDFOLDERS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDFOOTABLE="Addfootable"
 COM_COMPONENTBUILDER_COMPONENT_ADDFOOTABLE_LABEL="Add FooTable"
@@ -723,6 +738,7 @@ COM_COMPONENTBUILDER_COMPONENT_ADDREADME_LABEL="Add README"
 COM_COMPONENTBUILDER_COMPONENT_ADDRESS="Address"
 COM_COMPONENTBUILDER_COMPONENT_ADDSITE_VIEWS="Addsite Views"
 COM_COMPONENTBUILDER_COMPONENT_ADDSITE_VIEWS_DESCRIPTION="Setup the site views for this component."
+COM_COMPONENTBUILDER_COMPONENT_ADDSITE_VIEWS_LABEL="Site Views"
 COM_COMPONENTBUILDER_COMPONENT_ADDSITE_VIEWS_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_ADDUIKIT="Adduikit"
 COM_COMPONENTBUILDER_COMPONENT_ADDUIKIT_LABEL="Add Uikit"
@@ -740,6 +756,8 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_DASHBOARD_METHODS="Add Php Dashboard Meth
 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_BOTH="Add Php Helper Both"
+COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_BOTH_LABEL="Add PHP (helper Classes - Both admin & site)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_SITE="Add Php Helper Site"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_HELPER_SITE_LABEL="Add PHP (helper_site Class)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_METHOD_UNINSTALL="Add Php Method Uninstall"
@@ -758,7 +776,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 (to view table)"
+COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_LABEL="Add MySQL"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_OPTIONS_DESCRIPTION="if being added"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SQL_OPTIONS_LABEL="Options"
 COM_COMPONENTBUILDER_COMPONENT_ADD_UPDATE_SERVER="Add Update Server"
@@ -816,6 +834,13 @@ COM_COMPONENTBUILDER_COMPONENT_BOX_REMOVE="Box Remove"
 COM_COMPONENTBUILDER_COMPONENT_BRIEFCASE="Briefcase"
 COM_COMPONENTBUILDER_COMPONENT_BRUSH="Brush"
 COM_COMPONENTBUILDER_COMPONENT_BUBBLE_QUOTE="Bubble Quote"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP="Buildcomp"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL="Buildcompsql"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_DESCRIPTION="Add your MySQL here!"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_HINT="// Add MySQL Table Dump Here"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMPSQL_LABEL="MySQL"
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_DESCRIPTION="To build the component fields and back-end views dynamically using a mySQL table file."
+COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically"
 COM_COMPONENTBUILDER_COMPONENT_CALENDAR="Calendar"
 COM_COMPONENTBUILDER_COMPONENT_CALENDAR_THREE="Calendar 3"
 COM_COMPONENTBUILDER_COMPONENT_CALENDAR_TWO="Calendar 2"
@@ -868,6 +893,7 @@ COM_COMPONENTBUILDER_COMPONENT_CUBE="Cube"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW="Customadminview"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW_DESCRIPTION="Select a custom admin view"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOMADMINVIEW_LABEL="View"
+COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_VALUE_DESCRIPTION="Enter custom value in needed"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_VALUE_HINT="Custom Value Here"
@@ -878,6 +904,7 @@ 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_LABEL="Dashboard Tabs"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_DATABASE="Database"
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR="Debug Linenr"
@@ -892,6 +919,8 @@ COM_COMPONENTBUILDER_COMPONENT_DESCRIPTION_HINT="Add Description Here"
 COM_COMPONENTBUILDER_COMPONENT_DESCRIPTION_LABEL="Description"
 COM_COMPONENTBUILDER_COMPONENT_DETAILS="Details"
 COM_COMPONENTBUILDER_COMPONENT_DOWNLOAD="Download"
+COM_COMPONENTBUILDER_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)"
+COM_COMPONENTBUILDER_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration"
 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"
@@ -944,7 +973,7 @@ COM_COMPONENTBUILDER_COMPONENT_FOLDER_THREE="Folder 3"
 COM_COMPONENTBUILDER_COMPONENT_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_COMPONENT_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_COMPONENT_FRONT="Front"
-COM_COMPONENTBUILDER_COMPONENT_FTP_SERVERS="FTP Servers"
+COM_COMPONENTBUILDER_COMPONENT_FTP="FTP"
 COM_COMPONENTBUILDER_COMPONENT_GENERIC="Generic"
 COM_COMPONENTBUILDER_COMPONENT_GRID="Grid"
 COM_COMPONENTBUILDER_COMPONENT_GRID_TWO="Grid 2"
@@ -1041,6 +1070,8 @@ COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FILES_DESCRIPTION="You can add custom fi
 COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FILES_LABEL="Adding Custom Files"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FOLDERS_DESCRIPTION="You can add custom folders to the component, simply add the folders to the administrator/components/com_componentbuilder/custom folder and then select them here."
 COM_COMPONENTBUILDER_COMPONENT_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_DESCRIPTION="You can dynamically build the components back-end views and fields by adding a mySQL table dump, that has all the tables, or some more tables with its columns and data types. A very basic and generic set of fields and tables will be created, and added to the existing fields and tables of this component. <b>This is in beta testing, so this feature is still under development and will only be fully functional around June 2017...</b>"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_LABEL="Dynamic Builder Option"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view."
 COM_COMPONENTBUILDER_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard."
@@ -1067,7 +1098,7 @@ COM_COMPONENTBUILDER_COMPONENT_NOTE_README_DESCRIPTION="<div style='margin: 10px
 ## Build Time<br />
 <br />
 **###totalHours### Hours** or **###totalDays### Eight Hour Days**  (actual time the author saved - <br />
-due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))<br />
+due to [Automated Component Builder](http://vdm.bz/component-builder))<br />
 <br />
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,<br />
 > never making one mistake or taking any coffee break.)<br />
@@ -1092,7 +1123,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
 <br />
 Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### months**<br />
 <br />
-> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).<br />
+> This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).<br />
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)<br />
 <br />
 ## Donations<br />
@@ -1102,6 +1133,12 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo
  * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3
 </code></div>"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_README_LABEL="Demo README (with all place-holders)"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION="Add your FTP signature in the given field and during compilation the file will be moved to the FTP folder. You still need to point the above <b>update server</b> url to the xml file on your FTP server for it to work correctly.<br /><b>Here are the details of the signature:</b><br />&nbsp;&nbsp;&nbsp;string $host = '127.0.0.1'<br />&nbsp;&nbsp;&nbsp;string $port = '21'<br />&nbsp;&nbsp;&nbsp;array $options = array()<br />&nbsp;&nbsp;&nbsp;string $user = null<br />&nbsp;&nbsp;&nbsp;string $pass = null<br />&nbsp;&nbsp;&nbsp;OPTIONS = Array with any of these options:<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY]<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;timeout=>(int)<br /><b>Here is an example signature:</b><br /><code>host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password</code>"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL="The FTP Option"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION="Not really sure what other options to add.... so let me know. For now this option does not really do anything except adding the link above to your component as an update server. So it really could be called the manual option, since you will need to set the update server your self. You still need to point the above <b>update server</b> url to the manually created xml file for it to work correctly."
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL="The Other Options"
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION="The update server XML file will be added to the zipped package during compilation. You still need to point the above <b>update server</b> url to the xml wherever you have placed the files online."
+COM_COMPONENTBUILDER_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP Option"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component<br /><strong>Helpful Links</strong><br /><a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br /><a href='http://docs.whmcs.com/Licensing_Addon' target='_blank'>http://docs.whmcs.com/Licensing_Addon</a>"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL="Licensing addon module for WHMCS"
 COM_COMPONENTBUILDER_COMPONENT_NOTIFICATION="Notification"
@@ -1114,6 +1151,7 @@ COM_COMPONENTBUILDER_COMPONENT_NUMBER_LABEL="Number"
 COM_COMPONENTBUILDER_COMPONENT_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_COMPONENT_ORDER_DESCRIPTION="Overide the default order"
 COM_COMPONENTBUILDER_COMPONENT_ORDER_LABEL="Order"
+COM_COMPONENTBUILDER_COMPONENT_OTHER="Other"
 COM_COMPONENTBUILDER_COMPONENT_PALETTE="Palette"
 COM_COMPONENTBUILDER_COMPONENT_PARAGRAPH_CENTER="Paragraph Center"
 COM_COMPONENTBUILDER_COMPONENT_PARAGRAPH_JUSTIFY="Paragraph Justify"
@@ -1141,6 +1179,10 @@ 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!"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_ADMIN_LABEL="PHP"
+COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH="Php Helper Both"
+COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_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!"
+COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_BOTH_LABEL="PHP (for both admin & site)"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE="Php Helper Site"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_COMPONENT_PHP_HELPER_SITE_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!"
@@ -1233,6 +1275,7 @@ COM_COMPONENTBUILDER_COMPONENT_SQL_HINT="// Add MySQL Table Dump Here"
 COM_COMPONENTBUILDER_COMPONENT_SQL_LABEL="MySQL"
 COM_COMPONENTBUILDER_COMPONENT_SQL_TWEAK="Sql Tweak"
 COM_COMPONENTBUILDER_COMPONENT_SQL_TWEAK_DESCRIPTION="Tweak the view MySql dump settings."
+COM_COMPONENTBUILDER_COMPONENT_SQL_TWEAK_LABEL="MySql (tweak)"
 COM_COMPONENTBUILDER_COMPONENT_SQL_TWEAK_SELECT="Open"
 COM_COMPONENTBUILDER_COMPONENT_SQUARE="Square"
 COM_COMPONENTBUILDER_COMPONENT_STACK="Stack"
@@ -1274,11 +1317,14 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_USED_IN_JOOMLA_UPDATER="Updates (used in
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER="Update Server"
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_DESCRIPTION="Enter Update Server URL"
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_FTP="Update Server Ftp"
-COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION="The FTP details for the update server XML location. (string $host = '127.0.0.1', string $port = '21', array $options = array(), string $user = null, string $pass = null) OPTIONS = Array with any of these options: type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY], timeout=>(int)"
+COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION="The FTP details for the update server XML location."
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_FTP_HINT="host=HOSTNAME&port=PORT_INT&options[type]=FTP_BINARY&options[timeout]=15&username=user@name.com&password=password"
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_FTP_LABEL="Update Server FTP <br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_HINT="http://www.example.com/update/component.xml"
 COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_LABEL="Update Server"
+COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_TARGET="Update Server Target"
+COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_TARGET_DESCRIPTION="Select the type of way you would like the update server to be set."
+COM_COMPONENTBUILDER_COMPONENT_UPDATE_SERVER_TARGET_LABEL="Update Server Target"
 COM_COMPONENTBUILDER_COMPONENT_UPLOAD="Upload"
 COM_COMPONENTBUILDER_COMPONENT_URL_DESCRIPTION="Enter Download Link"
 COM_COMPONENTBUILDER_COMPONENT_URL_HINT="http://www.example.com/file.zip"
@@ -1294,6 +1340,7 @@ COM_COMPONENTBUILDER_COMPONENT_VERSION_HINT="1.0.0"
 COM_COMPONENTBUILDER_COMPONENT_VERSION_LABEL="SQL Update Version"
 COM_COMPONENTBUILDER_COMPONENT_VERSION_UPDATE="Version Update"
 COM_COMPONENTBUILDER_COMPONENT_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
+COM_COMPONENTBUILDER_COMPONENT_VERSION_UPDATE_LABEL="Version Updates"
 COM_COMPONENTBUILDER_COMPONENT_VERSION_UPDATE_SELECT="Add Update SQL"
 COM_COMPONENTBUILDER_COMPONENT_VTHREE="V3"
 COM_COMPONENTBUILDER_COMPONENT_VTWO="V2"
@@ -1316,6 +1363,7 @@ COM_COMPONENTBUILDER_COMPONENT_WIFI="Wifi"
 COM_COMPONENTBUILDER_COMPONENT_WRENCH="Wrench"
 COM_COMPONENTBUILDER_COMPONENT_YES="Yes"
 COM_COMPONENTBUILDER_COMPONENT_YOUTUBE="Youtube"
+COM_COMPONENTBUILDER_COMPONENT_ZIP="ZIP"
 COM_COMPONENTBUILDER_COMPONENT_ZOOM_IN="Zoom In"
 COM_COMPONENTBUILDER_COMPONENT_ZOOM_OUT="Zoom Out"
 COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
@@ -1542,6 +1590,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL="CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET="Custom Get"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods"
@@ -1918,6 +1967,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_F="f"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FF="ff"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER="Filter"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_DESCRIPTION="Here you can add filters to the query."
+COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_LABEL="Filter"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_DESCRIPTION="The type of filter you want to setup."
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_LABEL="Filter Type"
@@ -1937,6 +1987,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL="getType"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GG="gg"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL="Global"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_DESCRIPTION="Here you can add global variables."
+COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_LABEL="Set Global"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN="greater than"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL="greater than or equal"
@@ -1950,6 +2001,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_J="j"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JJ="jj"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE="Join Db Table"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION="Here you can add more table data to the query from other databases."
+COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL="Join DB Tables"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION="Name of the field"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT="b.field"
@@ -1961,6 +2013,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT="Join RIGHT"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER="Join RIGHT OUTER"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE="Join View Table"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION="Here you can add more tables to the query from the views of this component."
+COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL="Join View Tables"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOOMLA_DATABASE="Joomla Database"
 COM_COMPONENTBUILDER_DYNAMIC_GET_K="k"
@@ -2007,6 +2060,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL="Comparison Operators"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER="Order"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_DESCRIPTION="Here you can set the ordering per data set."
+COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_LABEL="Ordering"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_OTHER="Other"
 COM_COMPONENTBUILDER_DYNAMIC_GET_P="p"
@@ -2096,6 +2150,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_VV="vv"
 COM_COMPONENTBUILDER_DYNAMIC_GET_W="w"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE="Where"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_DESCRIPTION="Here you can add where to the query."
+COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_LABEL="Where"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WW="ww"
 COM_COMPONENTBUILDER_DYNAMIC_GET_X="x"
@@ -2247,6 +2302,7 @@ COM_COMPONENTBUILDER_FIELDTYPE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_FIELDTYPE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES="Properties"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_DESCRIPTION="Options for this field"
+COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_LABEL="Properties"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_SELECT="Add"
 COM_COMPONENTBUILDER_FIELDTYPE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_FIELDTYPE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Fieldtype to customise the alias."
@@ -2744,6 +2800,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL="Add PHP (custom JViewLegacy
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW="Add Php View"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
 COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT="Ajax Input"
+COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_LABEL="Ajax Input"
 COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_SELECT="Add"
 COM_COMPONENTBUILDER_SITE_VIEW_ALIAS="Alias"
 COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_DESCRIPTION="Add Name in Code Here"
@@ -2832,6 +2889,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_CUBE="Cube"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM="Custom"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON="Custom Button"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTONS="Custom Buttons"
+COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_SELECT="Add"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET="Custom Get"
 COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vxpfields;
+$items	= $displayData->vxtfields;
 $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,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/mysql_left.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/php_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/publishing.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/publlshing.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/settings_above.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/settings_left.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/settings_right.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/admin_view/settings_under.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/batchselection.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/component/admin_views_fullwidth.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	
@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vwjadmin_views;
+$items	= $displayData->vwmadmin_views;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit";

admin/layouts/component/custom_admin_views_fullwidth.php

@@ -0,0 +1,138 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.2.6
+	@build			30th December, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		custom_admin_views_fullwidth.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+// set the defaults
+$items	= $displayData->vwncustom_admin_views;
+$user	= JFactory::getUser();
+$id	= $displayData->item->id;
+$edit	= "index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit";
+$ref	= ($id) ? "&ref=component&refid=".$id : "";
+$new	= "index.php?option=com_componentbuilder&view=custom_admin_view&layout=edit".$ref;
+$can	= ComponentbuilderHelper::getActions('custom_admin_view');
+
+?>
+<div class="form-vertical">
+<?php if ($can->get('core.create')): ?>
+	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
+<?php endif; ?>
+<?php if (ComponentbuilderHelper::checkArray($items)): ?>
+<table class="footable table data custom_admin_views" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
+<thead>
+	<tr>
+		<th data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SNIPPET_LABEL'); ?>
+		</th>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STATUS'); ?>
+		</th>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ID'); ?>
+		</th>
+	</tr>
+</thead>
+<tbody>
+<?php foreach ($items as $i => $item): ?>
+	<?php
+		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
+		$userChkOut = JFactory::getUser($item->checked_out);
+		$canDo = ComponentbuilderHelper::getActions('custom_admin_view',$item,'custom_admin_views');
+	?>
+	<tr>
+		<td class="nowrap">
+			<?php if ($canDo->get('core.edit')): ?>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=component&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
+					<?php if ($item->checked_out): ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_admin_views.', $canCheckin); ?>
+					<?php endif; ?>
+			<?php else: ?>
+				<div class="name"><?php echo $displayData->escape($item->system_name); ?></div>
+			<?php endif; ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->name); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->alias); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->description); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->snippet_name); ?>
+		</td>
+		<?php if ($item->published == 1):?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
+					<?php echo JText::_('PUBLISHED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 0):?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
+					<?php echo JText::_('INACTIVE'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 2):?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == -2):?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php endif; ?>
+		<td class="nowrap center hidden-phone">
+			<?php echo $item->id; ?>
+		</td>
+	</tr>
+<?php endforeach; ?>
+</tbody>
+</table>
+<?php else: ?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php endif; ?>
+</div>

admin/layouts/component/details_above.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
 	

admin/layouts/component/details_left.php

@@ -10,12 +10,12 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.6
-	@build			23rd October, 2016
+	@build			30th December, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>	
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html