Improved the compiler, added the option to add the update server file to the zipped package, fixed a few bugs.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.2.0)
+# Component Builder (2.2.2)
 
 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.2) 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.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
 + *Name*: [Component Builder](https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st October, 2016
++ *Last Build*: 22nd November, 2016
-+ *Version*: 2.2.0
++ *Version*: 2.2.2
 + *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*: **86123**
++ *Line count*: **86438**
-+ *File count*: **537**
++ *File count*: **539**
 + *Folder count*: **99**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.2.0)
+# Component Builder (2.2.2)
 
 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.2) 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.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
 + *Name*: [Component Builder](https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st October, 2016
++ *Last Build*: 22nd November, 2016
-+ *Version*: 2.2.0
++ *Version*: 2.2.2
 + *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*: **86123**
++ *Line count*: **86438**
-+ *File count*: **537**
++ *File count*: **539**
 + *Folder count*: **99**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

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)
 					{
@@ -60,7 +60,7 @@ class ###Component###ControllerDownload extends JControllerLegacy
 							// Get local key
 							$localkey = ###Component###Helper::getLocalKey();
 							$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,390 @@ defined('_JEXEC') or die;
  */
 class Dropbox
 {
-	// the file name
+	/**
-	public $fileName;
+	 * final url
+	 */
+	protected $url;
 	
-	// the file array
+	/**
-	public $files = array();
+	 * The array for the post url
+	 */
+	protected $postUrl = array( 
+		"protocol" => "https://",
+		"suddomain" => "api.",
+		"domain" => "dropboxapi.com",
+		"path" => "/2/"
+	);
 
-	// the extension to get
+	/**
-	protected $getfiles = 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 extensions to leave
+	/**
-	protected $notfiles = array();
+	 * the target pathe to get
+	 */	
+	protected $targetPath = false;
+	protected $targetPathOriginal = false;
 
-	// the folder array
+	/**
-	protected $folders = array();
+	 * oauth token
+	 */	
+	protected $oauthToken;
 
-	// folder identifiers
+	/**
-	protected $getfolders = array('?dl=0');
+	 * the verious pathes we need
+	 */	
+	protected $permissionType;
 
-	// the list of extension to help identify what is folders (not exhaustive, only some of the commen files)
+	/**
-	protected $notfolders = array(
+	 * The loop controller in calling Dropbox API
-		'.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 $continueCalling = array();
-		'.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 success switch
+	 */	
+	protected $succes;
+
+	/**
+	 * 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();
 
 	/**
 	 * 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
+	 * =============
+	 * 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)
+		{
+			$this->targetPath = "";
+			
+			return true;
+		}
+		return false;
 	}
 	
-	public function getFile($url, $path)
+	protected function makeCall()
 	{
-		$newfname = $path;
+		if ($this->_isCurl())
-		if (($file = @fopen($url, "rb")) !== FALSE)
 		{
-			$filename = substr($path, strrpos($path, '/'));
+			return $this->makeCurlCall();
-			$makePath = str_replace($filename,'',$path);
-			if (!file_exists($makePath))
-			{
-				mkdir($makePath, 0755, true);
-			}
-
-			$newf = fopen($newfname, "wb");
 		}
 		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))
+		$query = json_encode($this->query);
-		{
-			// set main folder name
-			$this->fileName = md5($this->mainurl.$filename);
-		}
-		if ($this->checkArray($this->files))
-		{
-			$data = json_encode($this->files);
-			// now save this folders data to a file.
-			$this->saveJson($data);
 		
-			return true;
+		$options = array(
+			'http' => array(
+				'header' => "Content-Type: application/json\r\n".
+					"Authorization: Bearer ".$this->oauthToken,
+				'method'  => "POST",
+				'content' => $query
+				),
+			);
+		
+		$context = stream_context_create($options);
+		$response = file_get_contents($this->url.$this->domainpath[$this->type], false, $context);
+
+
+		if ($response === FALSE)
+		{
+			$this->error_summary[] = $this->type.'_error';
+			return false;
+		}
+		else
+		{
+			// store the result
+			return $this->setTheResult(json_decode($response));
+		}
+	}
+	
+	protected function makeCurlCall()
+	{
+		$query = json_encode($this->query);
+		
+		$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);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $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;
+			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;
 		}
 		return false;
 	}
 	
-	protected function saveJson($data)
+	protected function storeSharedLink($path, $url)
 	{
-		if ($this->checkString($data))
+		// we need to store the url to DB
+		if (isset($this->mediaData[$path]))
 		{
-			/*
+			$localListing		= array();
-				for now it will save
+			$localListing['id']	= 0;
-				the files in the same
+			$localListing['name']	= $this->mediaData[$path]['name'];
-				directory as the php
+			$localListing['size']	= $this->mediaData[$path]['size'];
-				file where the class
+			$localListing['key']	= $path;
-				is called we will have
+			$localListing['url']	= $url;
-				to change this to suite
+			$localListing['build']	= $this->build;
-				your custom needs.
+			// free some memory
-			*/
+			unset($this->mediaData[$path]);
-			$fp = fopen($this->fileName.'.json', 'w');
+			// check if item already set
-			fwrite($fp, $data);
+			if ($id = $this->model->searchForId($path))
-			fclose($fp);
+			{
+				// update item
+				$localListing['id'] = $id;
+			}
+			return $this->model->save($localListing);
 		}
+		return false;
 	}
 
-	protected function parseFolders($url, $foldername)
+	protected function storeFiles($entries)
 	{		
-		if ($this->checkString($url))
+		foreach ($entries as $item)
 		{			
-			// get the page html
+			if (isset($item->{'.tag'}) && 'file' == $item->{'.tag'} && isset($item->name))
-			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)
@@ -329,6 +424,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)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -337,6 +442,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
@@ -78,11 +74,21 @@ class Dropboxupdater
 	**/
 	protected $localkey = false;
 	
+	/**
+	* 	Main dropbox class
+	**/
+	protected $dropbox;
+	
 	/**
 	* 	component parameters
 	**/
 	protected $app_params;
 	
+	/**
+	* 	the errors
+	**/
+	protected $errors = array();
+
 	/**
 	*	everything we want done when initialized
 	**/
@@ -90,32 +96,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 +168,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 +176,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,20 +198,46 @@ 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;
 			}
 		}				
-		return false;
 	}
 
 	/**
@@ -182,13 +245,12 @@ class Dropboxupdater
 	**/
 	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,32 +262,54 @@ 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();
+		// 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 +327,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 +336,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'.$this->localkey);
 		// set file path
 		$this->infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json';
 		
@@ -289,11 +374,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 +388,6 @@ class Dropboxupdater
 		}
 	}
 
-	/**
-	*	save the update info
-	**/
-	protected function saveProgress()
-	{
-		return $this->saveJson(json_encode($this->progress),$this->progressFilePath);
-	}
-
 	/**
 	*	save the update info
 	**/
@@ -324,93 +403,32 @@ class Dropboxupdater
 	{
 		// we need more then the normal time to run this script 5 minutes at least.
 		ini_set('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;
-				$this->saveProgress();
-			}
-			// get ldropbox links
-			$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);
 		}		
-		
+		// if this is a manual update, then revoke the token
-		// now store the new listing
+		if ($this->forceUpdate)
-		return $this->setNewListing();
+		{
+			$this->dropbox->revokeToken($this->data->oauthtoken);
+		}
+		return true;
 	}
 	
-	protected function setNewListing()
+	protected function resetUpdate()
 	{
-		// set progress
+		if ($this->okay)
-		$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
+			// make sure the update reset
-			$locker = new FOFEncryptAes($this->localkey, 128);
+			$this->updateInfo->nextupdate = $this->next;
-			foreach ($this->listing as $folder => $link)
+			$this->updateInfo->updateactive = false;
-			{
+			$this->updateInfo->updatenow = false;
-				$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();
+			return $this->saveUpdateInfo();
-	}
-
-	/**
-	*	set the configeration for dropbox class
-	**/
-	protected function setDropboxConfig()
-	{
-		// reset config
-		$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;
 		}
-		// set other config settings
+		return false;
-		$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'])
 			{
@@ -187,7 +187,7 @@ class Compiler extends Infusion
 				}
 			}
 			// 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
@@ -329,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/e_Interpretation.php

@@ -445,13 +445,13 @@ class Interpretation extends Fields
 			$function = array();
 			if (isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder))
 			{
-				$function[] = "\n\n\tpublic static function getCryptKey(\$type)";
+				$function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)";
 				$function[] = "\t{";
 				$function[] = "\t\t//".$this->setLine(__LINE__)." Get the global params";
 				$function[] = "\t\t\$params = JComponentHelper::getParams('com_".$component."', true);";
 				$function[] = "\t\tif ('advanced' == \$type)";
 				$function[] = "\t\t{";
-				$function[] = "\t\t\t\$advanced_key = \$params->get('advanced_key', null);";
+				$function[] = "\t\t\t\$advanced_key = \$params->get('advanced_key', \$default);";
 				$function[] = "\t\t\tif (\$advanced_key)";
 				$function[] = "\t\t\t{";
 				$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." load the file";
@@ -462,7 +462,7 @@ class Interpretation extends Fields
 				$function[] = "\t\t}";
 				$function[] = "\t\telseif ('basic' == \$type)";
 				$function[] = "\t\t{";
-				$function[] = "\t\t\t\$basic_key = \$params->get('basic_key', null);";
+				$function[] = "\t\t\t\$basic_key = \$params->get('basic_key', \$default);";
 				$function[] = "\t\t\tif (\$basic_key)";
 				$function[] = "\t\t\t{";
 				$function[] = "\t\t\t\treturn \$basic_key;";
@@ -473,13 +473,13 @@ class Interpretation extends Fields
 			}
 			elseif (isset($this->advancedEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->advancedEncryptionBuilder))
 			{
-				$function[] = "\n\n\tpublic static function getCryptKey(\$type)";
+				$function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)";
 				$function[] = "\t{";
 				$function[] = "\t\tif ('advanced' == \$type)";
 				$function[] = "\t\t{";
 				$function[] = "\t\t\t//".$this->setLine(__LINE__)." Get the global params";
 				$function[] = "\t\t\t\$params = JComponentHelper::getParams('com_".$component."', true);";
-				$function[] = "\t\t\t\$advanced_key = \$params->get('advanced_key', null);";
+				$function[] = "\t\t\t\$advanced_key = \$params->get('advanced_key', \$default);";
 				$function[] = "\t\t\tif (\$advanced_key)";
 				$function[] = "\t\t\t{";
 				$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." load the file";
@@ -493,13 +493,13 @@ class Interpretation extends Fields
 			}
 			elseif (isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder))
 			{
-				$function[] = "\n\n\tpublic static function getCryptKey(\$type)";
+				$function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)";
 				$function[] = "\t{";
 				$function[] = "\t\tif ('basic' == \$type)";
 				$function[] = "\t\t{";
 				$function[] = "\t\t\t//".$this->setLine(__LINE__)." Get the global params";
 				$function[] = "\t\t\t\$params = JComponentHelper::getParams('com_".$component."', true);";
-				$function[] = "\t\t\t\$basic_key = \$params->get('basic_key', null);";
+				$function[] = "\t\t\t\$basic_key = \$params->get('basic_key', \$default);";
 				$function[] = "\t\t\tif (\$basic_key)";
 				$function[] = "\t\t\t{";
 				$function[] = "\t\t\t\treturn \$basic_key;";
@@ -521,7 +521,7 @@ class Interpretation extends Fields
 		{
 			$updateXML = array();
 			// add the update server
-			if ($this->componentData->add_update_server)
+			if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
 			{
 				$updateXML[] = '<updates>';
 			}
@@ -545,7 +545,7 @@ class Interpretation extends Fields
 					$this->fileContentDynamic[$name.'_'.$update['version']]['###UPDATE_VERSION_MYSQL###'] = $update['mysql'];
 				}
 				// add the update server
-				if ($this->componentData->add_update_server)
+				if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
 				{
 					// build update xml
 					$updateXML[] = "\t<update>";
@@ -571,8 +571,8 @@ class Interpretation extends Fields
 					$updateXML[] = "\t</update>";
 				}
 			}
-			// add the update server 
+			// add the update server file
-			if ($this->componentData->add_update_server)
+			if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
 			{
 				$updateXML[] = '</updates>';
 				// ###UPDATE_SERVER_XML###
@@ -583,16 +583,19 @@ class Interpretation extends Fields
 				
 				// set the Update server file name
 				$this->updateServerFileName = $name;
-
-				// ###UPDATESERVER###
-				$updateServer = array();
-				$updateServer[] = "\n\t<updateservers>";
-				$updateServer[] = "\t\t".'<server type="extension" enabled="1" element="com_'.$this->fileContentStatic['###component###'].'" name="'.$this->fileContentStatic['###Component_name###'].'">'.$this->componentData->update_server.'</server>';
-				$updateServer[] = "\t</updateservers>";
-				// return the array to string
-				$updateServer = implode("\n", $updateServer);
 			}
 		}
+		// add the update server link to component XML
+		if ($this->componentData->add_update_server && isset($this->componentData->update_server) && ComponentbuilderHelper::checkString($this->componentData->update_server))
+		{
+			// ###UPDATESERVER###
+			$updateServer = array();
+			$updateServer[] = "\n\t<updateservers>";
+			$updateServer[] = "\t\t".'<server type="extension" enabled="1" element="com_'.$this->fileContentStatic['###component###'].'" name="'.$this->fileContentStatic['###Component_name###'].'">'.$this->componentData->update_server.'</server>';
+			$updateServer[] = "\t</updateservers>";
+			// return the array to string
+			$updateServer = implode("\n", $updateServer);
+		}
 		// add update server details to component XML file
 		$this->fileContentStatic['###UPDATESERVER###'] = $updateServer;
 	}
@@ -2711,6 +2714,27 @@ class Interpretation extends Fields
 		// check if custom button should be added
 		if (isset($view['settings']->add_custom_button) && $view['settings']->add_custom_button == 1)
 		{
+			// insure the controller and model strings are added
+			if (ComponentbuilderHelper::checkString($view['settings']->php_controller) && $view['settings']->php_controller != '//')
+			{
+				// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
+				$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] =
+				"\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller);
+				if ('site' == $this->target)
+				{
+					// add the controller for this view
+					// build the file
+					$target = array($this->target => $viewName);
+					$this->buildDynamique($target,'custom_form');
+					###GET_FORM_CUSTOM###
+				}
+			}
+			if (ComponentbuilderHelper::checkString($view['settings']->php_model) && $view['settings']->php_model != '//')
+			{
+				// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
+				$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] =
+				"\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model);
+			}
 			if (ComponentbuilderHelper::checkArray($view['settings']->custom_buttons))
 			{
 				$buttons = array();
@@ -2732,27 +2756,6 @@ class Interpretation extends Fields
 				}
 				if (ComponentbuilderHelper::checkArray($buttons))
 				{
-					if (ComponentbuilderHelper::checkString($view['settings']->php_controller))
-					{
-						// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
-						$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] =
-						"\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller);
-						if ('site' == $this->target)
-						{
-							// add the controller for this view
-							// build the file
-							$target = array($this->target => $viewName);
-							$this->buildDynamique($target,'custom_form');
-							###GET_FORM_CUSTOM###
-						}
-					}
-					if (ComponentbuilderHelper::checkString($view['settings']->php_model))
-					{
-						// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
-						$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] =
-						"\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model);
-					}
-
 					return "\n".implode("\n",$buttons);
 				}
 			}

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -1465,13 +1465,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/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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"
@@ -758,7 +774,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"
@@ -878,6 +894,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 +909,7 @@ 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_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 +962,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"
@@ -1102,6 +1120,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 +1138,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"
@@ -1233,6 +1258,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 +1300,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 +1323,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 +1346,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 +1573,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 +1950,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 +1970,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 +1984,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 +1996,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 +2043,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 +2133,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 +2285,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 +2783,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 +2872,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,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/dynamic_integration_fullwidth.php

@@ -10,11 +10,11 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		ftp_servers_fullwidth.php
+	@subpackage		dynamic_integration_fullwidth.php
 	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-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 
@@ -32,6 +32,10 @@ $form = $displayData->getForm();
 $fields = $displayData->get('fields') ?: array(
 	'add_update_server',
 	'update_server',
+	'update_server_target',
+	'note_update_server_note_ftp',
+	'note_update_server_note_zip',
+	'note_update_server_note_other',
 	'update_server_ftp',
 	'add_sales_server',
 	'sales_server_ftp'

admin/layouts/component/libs_helpers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php

admin/layouts/component/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/component/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.0
+	@version		2.2.2
-	@build			31st October, 2016
+	@build			22nd November, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php