added the subform and custom and other fields to the demo

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.3.10)
+# Component Builder (2.4.7)
 
 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.3.10) 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.4.7) 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.
 
@@ -75,12 +75,14 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
 # Get Access to Video Tutorials
 
-> **You can purchase more demo content for Component Builder including access to training & help video tutorials:**
+> **You can purchase more [demo content](http://vdm.bz/jcb-packages) for Component Builder including access to training & help video tutorials:**
 
-+ Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component)
-+ Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component)
-+ Help View Integration*
-+ Training & Help Videos* tutorials in the component included.
++ *Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demo.zip) _(free)_
++ *Advance Demo Component* get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demoAdvanced.zip) _([buy key](http://vdm.bz/get-advance-demo-key))_
++ *Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_sermondistributor.zip) _([buy key](http://vdm.bz/get-sermon-distributor-key))_
++ *Location Data* see the build on [github](https://github.com/vdm-io/Joomla-Location-Data) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_locationData.zip) _([buy key](http://vdm.bz/get-location-data-key))_
++ *Help View Integration*
++ *Training & Help Videos* tutorials in the component included.
 
 [**GET ACCESS NOW!**](http://vdm.bz/component-builder)
 
@@ -105,13 +107,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st March, 2017
-+ *Version*: 2.3.10
++ *Last Build*: 18th June, 2017
++ *Version*: 2.4.7
 + *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*: **96064**
-+ *File count*: **578**
-+ *Folder count*: **107**
++ *Line count*: **106061**
++ *File count*: **644**
++ *Folder count*: **115**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
@@ -120,4 +122,4 @@ Component Builder is mapped as a component in itself on my local development env
 
 Come on buy me a coffee :)
  * PayPal: pay@vdm.io
- * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3
+ * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.3.10)
+# Component Builder (2.4.7)
 
 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.3.10) 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.4.7) 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.
 
@@ -75,12 +75,14 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
 # Get Access to Video Tutorials
 
-> **You can purchase more demo content for Component Builder including access to training & help video tutorials:**
+> **You can purchase more [demo content](http://vdm.bz/jcb-packages) for Component Builder including access to training & help video tutorials:**
 
-+ Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component)
-+ Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component)
-+ Help View Integration*
-+ Training & Help Videos* tutorials in the component included.
++ *Demo Component* see the build on [github](https://github.com/namibia/demo-joomla-3-component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demo.zip) _(free)_
++ *Advance Demo Component* get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_demoAdvanced.zip) _([buy key](http://vdm.bz/get-advance-demo-key))_
++ *Sermon Distributor* see the build on [github](https://github.com/SermonDistributor/Joomla-3-Component) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_sermondistributor.zip) _([buy key](http://vdm.bz/get-sermon-distributor-key))_
++ *Location Data* see the build on [github](https://github.com/vdm-io/Joomla-Location-Data) or get the [JCB Package](https://github.com/vdm-io/JCB-Packages/raw/master/JCB_locationData.zip) _([buy key](http://vdm.bz/get-location-data-key))_
++ *Help View Integration*
++ *Training & Help Videos* tutorials in the component included.
 
 [**GET ACCESS NOW!**](http://vdm.bz/component-builder)
 
@@ -105,13 +107,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st March, 2017
-+ *Version*: 2.3.10
++ *Last Build*: 18th June, 2017
++ *Version*: 2.4.7
 + *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*: **96064**
-+ *File count*: **578**
-+ *Folder count*: **107**
++ *Line count*: **106061**
++ *File count*: **644**
++ *Folder count*: **115**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
@@ -120,4 +122,4 @@ Component Builder is mapped as a component in itself on my local development env
 
 Come on buy me a coffee :)
  * PayPal: pay@vdm.io
- * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3
+ * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh

admin/access.xml

@@ -113,6 +113,29 @@
 		<action name="joomla_component.export" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EXPORT_DESC" />
 		<action name="joomla_component.import" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_IMPORT_DESC" />
 		<action name="joomla_component.submenu" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC" />
+		<action name="language_translation.access" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC" />
+		<action name="language_translation.batch" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC" />
+		<action name="language_translation.create" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC" />
+		<action name="language_translation.dashboard_list" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC" />
+		<action name="language_translation.delete" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC" />
+		<action name="language_translation.edit" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_DESC" />
+		<action name="language_translation.edit.own" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC" />
+		<action name="language_translation.edit.state" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC" />
+		<action name="language_translation.version" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC" />
+		<action name="language_translation.export" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC" />
+		<action name="language_translation.import" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC" />
+		<action name="language_translation.submenu" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC" />
+		<action name="language.access" title="COM_COMPONENTBUILDER_LANGUAGES_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC" />
+		<action name="language.batch" title="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC" />
+		<action name="language.create" title="COM_COMPONENTBUILDER_LANGUAGES_CREATE" description="COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC" />
+		<action name="language.delete" title="COM_COMPONENTBUILDER_LANGUAGES_DELETE" description="COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC" />
+		<action name="language.edit" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_DESC" />
+		<action name="language.edit.own" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN_DESC" />
+		<action name="language.edit.state" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC" />
+		<action name="language.version" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC" />
+		<action name="language.export" title="COM_COMPONENTBUILDER_LANGUAGES_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC" />
+		<action name="language.import" title="COM_COMPONENTBUILDER_LANGUAGES_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC" />
+		<action name="language.submenu" title="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC" />
 		<action name="layout.access" title="COM_COMPONENTBUILDER_LAYOUTS_ACCESS" description="COM_COMPONENTBUILDER_LAYOUTS_ACCESS_DESC" />
 		<action name="layout.batch" title="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE" description="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE_DESC" />
 		<action name="layout.dashboard_add" title="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_ADD_DESC" />
@@ -243,6 +266,24 @@
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 	</section>
+	<section name="language_translation">
+		<action name="language_translation.edit" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_DESC" />
+		<action name="language_translation.edit.own" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC" />
+		<action name="language_translation.edit.state" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC" />
+		<action name="language_translation.create" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC" />
+		<action name="language_translation.delete" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC" />
+		<action name="language_translation.access" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC" />
+		<action name="language_translation.version" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC" />
+	</section>
+	<section name="language">
+		<action name="language.edit" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_DESC" />
+		<action name="language.edit.own" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN_DESC" />
+		<action name="language.edit.state" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC" />
+		<action name="language.create" title="COM_COMPONENTBUILDER_LANGUAGES_CREATE" description="COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC" />
+		<action name="language.delete" title="COM_COMPONENTBUILDER_LANGUAGES_DELETE" description="COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC" />
+		<action name="language.access" title="COM_COMPONENTBUILDER_LANGUAGES_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC" />
+		<action name="language.version" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC" />
+	</section>
 	<section name="help_document">
 		<action name="help_document.edit" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_DESC" />
 		<action name="help_document.edit.own" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN_DESC" />

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 108 of this MVC
-	@build			24th March, 2017
+	@version		@update number 111 of this MVC
+	@build			7th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 108 of this MVC
-	@build			24th March, 2017
+	@version		@update number 111 of this MVC
+	@build			7th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/compiler.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 47 of this MVC
-	@build			21st March, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.css

admin/assets/css/custom_code.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			1st March, 2017
+	@version		@update number 82 of this MVC
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css

admin/assets/css/custom_codes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			1st March, 2017
+	@version		@update number 82 of this MVC
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			15th January, 2017
+	@version		@update number 84 of this MVC
+	@build			4th May, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			15th January, 2017
+	@version		@update number 84 of this MVC
+	@build			4th May, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			3rd February, 2017
+	@version		@update number 38 of this MVC
+	@build			28th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			3rd February, 2017
+	@version		@update number 38 of this MVC
+	@build			28th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 12 of this MVC
-	@build			20th October, 2016
+	@version		@update number 13 of this MVC
+	@build			13th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 12 of this MVC
-	@build			20th October, 2016
+	@version		@update number 13 of this MVC
+	@build			13th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/joomla_component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 266 of this MVC
-	@build			30th March, 2017
+	@version		@update number 338 of this MVC
+	@build			16th June, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.css

admin/assets/css/joomla_components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 266 of this MVC
-	@build			30th March, 2017
+	@version		@update number 338 of this MVC
+	@build			16th June, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.css

admin/assets/css/language.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 3 of this MVC
+	@build			3rd April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language.css
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* CSS Document */
+
+

admin/assets/css/language_translation.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language_translation.css
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* CSS Document */
+
+

admin/assets/css/language_translations.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language_translations.css
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* CSS Document */
+
+

admin/assets/css/languages.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 3 of this MVC
+	@build			3rd April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		languages.css
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* CSS Document */
+
+

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			22nd February, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			22nd February, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/template.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 40 of this MVC
-	@build			22nd February, 2017
+	@build			1st April, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 40 of this MVC
-	@build			22nd February, 2017
+	@build			1st April, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/joomla_3/Helper.php

@@ -706,7 +706,8 @@ abstract class ###Component###Helper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}

admin/compiler/joomla_3/Helper_site.php

@@ -698,7 +698,8 @@ abstract class ###Component###Helper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}

admin/compiler/joomla_3/component.xml

@@ -60,8 +60,7 @@
 	</files>
 
 	<languages folder="site">
-		<language tag="en-GB">language/en-GB/en-GB.com_###component###.ini</language>
-		<language tag="en-GB">language/en-GB/en-GB.com_###component###.sys.ini</language>
+		###SITE_LANGUAGES###
 	</languages>
 
 	<administration>
@@ -86,8 +85,7 @@
 		</files>
 
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB/en-GB.com_###component###.ini</language>
-			<language tag="en-GB">language/en-GB/en-GB.com_###component###.sys.ini</language>
+			###ADMIN_LANGUAGES###
 		</languages>
 
 	</administration>###UPDATESERVER###

admin/compiler/joomla_3/default_vdm.php

@@ -30,7 +30,6 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 $manifest = ###Component###Helper::manifest();
-JHtml::_('bootstrap.loadCss');
 
 ?>
 <img alt="<?php echo JText::_('COM_###COMPONENT###'); ?>" src="components/com_###component###/assets/images/component-300.###COMP_IMAGE_TYPE###">

admin/compiler/joomla_3/settings.json

@@ -170,18 +170,6 @@
             "rename": false,
             "type": "file"
       },
-      "en-GB.com_admin.ini": {
-            "naam":"en-GB.com_admin.ini",
-            "path": "c0mp0n3nt/admin/language/en-GB",
-            "rename": "admin",
-            "type": "file"
-      },
-      "en-GB.com_admin.sys.ini": {
-            "naam":"en-GB.com_admin.sys.ini",
-            "path": "c0mp0n3nt/admin/language/en-GB",
-            "rename": "admin",
-            "type": "file"
-      },
       "install.mysql.utf8.sql": {
             "naam":"install.mysql.utf8.sql",
             "path": "c0mp0n3nt/admin/sql",
@@ -219,18 +207,6 @@
             "rename": false,
             "type": "file"
       },
-      "en-GB.com_site.ini": {
-            "naam":"en-GB.com_site.ini",
-            "path": "c0mp0n3nt/site/language/en-GB",
-            "rename": "site",
-            "type": "file"
-      },
-      "en-GB.com_site.sys.ini": {
-            "naam":"en-GB.com_site.sys.ini",
-            "path": "c0mp0n3nt/site/language/en-GB",
-            "rename": "site",
-            "type": "file"
-      },
       "headercheck.php": {
             "naam":"headercheck.php",
             "path": "c0mp0n3nt/site/helpers",

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -44,7 +44,10 @@ $document->addScript('components/com_componentbuilder/assets/js/admin.js');
 
 // require helper files
 JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); 
-JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 
+JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 
+
+// Triger the Global Admin Event
+ComponentbuilderHelper::globalEvent($document);
 
 // import joomla controller library
 jimport('joomla.application.component.controller');

admin/config.xml

@@ -61,6 +61,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>		
+		<!-- Percentagelanguageadd Field. Type: Number. (joomla) -->
+		<field
+			type="number"
+			name="percentagelanguageadd"
+			label="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL"
+			default="50"
+			description="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION"
+			class="text_area"
+			required="true"
+			min="10"
+			max="100"
+			step="10"
+		/>		
 		<!-- Spacer_hr_a Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_a" hr="true" class="spacer_hr_a" />
 		<field name="autorTitle"
@@ -331,47 +344,6 @@
 			validated="url"
 			message="Error! Please add link here."
 			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT"
-		/>		
-		<!-- Export_buy_query Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="export_buy_query"
-			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_LABEL"
-			size="40"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_DESCRIPTION"
-			class="text_area"
-			filter="STRING"
-			message="Error! Please email address here."
-			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_HINT"
-		/>		
-		<!-- Export_package_link Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="export_package_link"
-			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_LABEL"
-			size="60"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_DESCRIPTION"
-			class="text_area"
-			required="false"
-			filter="url"
-			validated="url"
-			message="Error! Please add link here."
-			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_HINT"
-		/>		
-		<!-- Export_package_query Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="export_package_query"
-			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_LABEL"
-			size="40"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_DESCRIPTION"
-			class="text_area"
-			filter="STRING"
-			message="Error! Please email address here."
-			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_HINT"
 		/>
 	</fieldset>
 	<fieldset

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
@@ -99,6 +99,8 @@ class ComponentbuilderController extends JControllerLegacy
 				'snippet' => 'snippets',
 				'field' => 'fields',
 				'fieldtype' => 'fieldtypes',
+				'language_translation' => 'language_translations',
+				'language' => 'languages',
 				'help_document' => 'help_documents'
                                 );
                         // check if this is a list view

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 108 of this MVC
-	@build			24th March, 2017
+	@version		@update number 111 of this MVC
+	@build			7th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 108 of this MVC
-	@build			24th March, 2017
+	@version		@update number 111 of this MVC
+	@build			7th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@@ -57,7 +57,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('viewTableColumns', 'ajax');
 		$this->registerTask('checkFunctionName', 'ajax');
 		$this->registerTask('usedin', 'ajax');
-		$this->registerTask('fieldOptions', 'ajax');
+		$this->registerTask('fieldOptions', 'ajax');
+		$this->registerTask('getBuildTable', 'ajax');
+		$this->registerTask('getButton', 'ajax');
 	}
 
 	public function ajax()
@@ -687,6 +689,83 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 							echo "(".json_encode($e).");";
 						}
 					}
+				break;
+				case 'getBuildTable':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$idNameValue = $jinput->get('idName', NULL, 'CMD');
+						$objectValue = $jinput->get('object', NULL, 'STRING');
+						if($idNameValue && $objectValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getBuildTable($idNameValue, $objectValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
+				case 'getButton':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$typeValue = $jinput->get('type', NULL, 'WORD');
+						if($typeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getButton($typeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
 				break;
 			}
 		}

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 47 of this MVC
-	@build			21st March, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/custom_code.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			1st March, 2017
+	@version		@update number 82 of this MVC
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php

admin/controllers/custom_codes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			1st March, 2017
+	@version		@update number 82 of this MVC
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			15th January, 2017
+	@version		@update number 84 of this MVC
+	@build			4th May, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 81 of this MVC
-	@build			15th January, 2017
+	@version		@update number 84 of this MVC
+	@build			4th May, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			3rd February, 2017
+	@version		@update number 38 of this MVC
+	@build			28th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			3rd February, 2017
+	@version		@update number 38 of this MVC
+	@build			28th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 12 of this MVC
-	@build			20th October, 2016
+	@version		@update number 13 of this MVC
+	@build			13th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 12 of this MVC
-	@build			20th October, 2016
+	@version		@update number 13 of this MVC
+	@build			13th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/import_joomla_components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php

admin/controllers/joomla_component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 266 of this MVC
-	@build			30th March, 2017
+	@version		@update number 338 of this MVC
+	@build			16th June, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php

admin/controllers/joomla_components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 266 of this MVC
-	@build			30th March, 2017
+	@version		@update number 338 of this MVC
+	@build			16th June, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php

admin/controllers/language.php

@@ -0,0 +1,326 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 3 of this MVC
+	@build			3rd April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controllerform library
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Language Controller
+ */
+class ComponentbuilderControllerLanguage extends JControllerForm
+{
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 * @note   Replaces _task.
+	 */
+	protected $task;
+
+	public function __construct($config = array())
+	{
+		$this->view_list = 'Languages'; // safeguard for setting the return view listing to the main view.
+		parent::__construct($config);
+	}
+
+        /**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		// Access check.
+		$access = JFactory::getUser()->authorise('language.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('language.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// get user object.
+		$user		= JFactory::getUser();
+		// get record id.
+		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('language.access', 'com_componentbuilder.language.' . (int) $recordId) &&  $user->authorise('language.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('language.edit', 'com_componentbuilder.language.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('language.edit.own', 'com_componentbuilder.language.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('language.edit.own', 'com_componentbuilder'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('language.edit', $this->option);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   12.2
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		$tmpl   = $this->input->get('tmpl');
+		$layout = $this->input->get('layout', 'edit', 'string');
+
+		$ref 	= $this->input->get('ref', 0, 'string');
+		$refid 	= $this->input->get('refid', 0, 'int');
+
+		// Setup redirect info.
+
+		$append = '';
+
+		if ($refid)
+                {
+			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+		}
+                elseif ($ref)
+                {
+			$append .= '&ref='.(string)$ref;
+                }
+
+		if ($tmpl)
+		{
+			$append .= '&tmpl=' . $tmpl;
+		}
+
+		if ($layout)
+		{
+			$append .= '&layout=' . $layout;
+		}
+
+		if ($recordId)
+		{
+			$append .= '&' . $urlVar . '=' . $recordId;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Language', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=languages' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function cancel($key = null)
+	{
+		// get the referal details
+		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->refid 	= $this->input->get('refid', 0, 'int');
+
+		$cancel = parent::cancel($key);
+
+		if ($cancel)
+		{
+			if ($this->refid)
+			{
+				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+				// Redirect to the item screen.
+				$this->setRedirect(
+					JRoute::_(
+						'index.php?option=' . $this->option . $redirect, false
+					)
+				);
+			}
+			elseif ($this->ref)
+			{
+				$redirect = '&view='.(string)$this->ref;
+
+				// Redirect to the list screen.
+				$this->setRedirect(
+					JRoute::_(
+						'index.php?option=' . $this->option . $redirect, false
+					)
+				);
+			}
+		}
+		else
+		{
+			// Redirect to the items screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+				)
+			);
+		}
+		return $cancel;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// get the referal details
+		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->refid 	= $this->input->get('refid', 0, 'int');
+
+                if ($this->ref || $this->refid)
+                {
+                        // to make sure the item is checkedin on redirect
+                        $this->task = 'save';
+                }
+
+		$saved = parent::save($key, $urlVar);
+
+		if ($this->refid && $saved)
+		{
+			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref && $saved)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $saved;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   JModel  &$model     The data model object.
+	 * @param   array   $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		return;
+	}
+
+}

admin/controllers/language_translation.php

@@ -0,0 +1,326 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language_translation.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controllerform library
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Language_translation Controller
+ */
+class ComponentbuilderControllerLanguage_translation extends JControllerForm
+{
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 * @note   Replaces _task.
+	 */
+	protected $task;
+
+	public function __construct($config = array())
+	{
+		$this->view_list = 'Language_translations'; // safeguard for setting the return view listing to the main view.
+		parent::__construct($config);
+	}
+
+        /**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		// Access check.
+		$access = JFactory::getUser()->authorise('language_translation.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('language_translation.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// get user object.
+		$user		= JFactory::getUser();
+		// get record id.
+		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $recordId) &&  $user->authorise('language_translation.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('language_translation.edit', 'com_componentbuilder.language_translation.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('language_translation.edit.own', 'com_componentbuilder.language_translation.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('language_translation.edit.own', 'com_componentbuilder'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('language_translation.edit', $this->option);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   12.2
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		$tmpl   = $this->input->get('tmpl');
+		$layout = $this->input->get('layout', 'edit', 'string');
+
+		$ref 	= $this->input->get('ref', 0, 'string');
+		$refid 	= $this->input->get('refid', 0, 'int');
+
+		// Setup redirect info.
+
+		$append = '';
+
+		if ($refid)
+                {
+			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+		}
+                elseif ($ref)
+                {
+			$append .= '&ref='.(string)$ref;
+                }
+
+		if ($tmpl)
+		{
+			$append .= '&tmpl=' . $tmpl;
+		}
+
+		if ($layout)
+		{
+			$append .= '&layout=' . $layout;
+		}
+
+		if ($recordId)
+		{
+			$append .= '&' . $urlVar . '=' . $recordId;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Language_translation', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function cancel($key = null)
+	{
+		// get the referal details
+		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->refid 	= $this->input->get('refid', 0, 'int');
+
+		$cancel = parent::cancel($key);
+
+		if ($cancel)
+		{
+			if ($this->refid)
+			{
+				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+				// Redirect to the item screen.
+				$this->setRedirect(
+					JRoute::_(
+						'index.php?option=' . $this->option . $redirect, false
+					)
+				);
+			}
+			elseif ($this->ref)
+			{
+				$redirect = '&view='.(string)$this->ref;
+
+				// Redirect to the list screen.
+				$this->setRedirect(
+					JRoute::_(
+						'index.php?option=' . $this->option . $redirect, false
+					)
+				);
+			}
+		}
+		else
+		{
+			// Redirect to the items screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+				)
+			);
+		}
+		return $cancel;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// get the referal details
+		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->refid 	= $this->input->get('refid', 0, 'int');
+
+                if ($this->ref || $this->refid)
+                {
+                        // to make sure the item is checkedin on redirect
+                        $this->task = 'save';
+                }
+
+		$saved = parent::save($key, $urlVar);
+
+		if ($this->refid && $saved)
+		{
+			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref && $saved)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $saved;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   JModel  &$model     The data model object.
+	 * @param   array   $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		return;
+	}
+
+}

admin/controllers/language_translations.php

@@ -0,0 +1,111 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		language_translations.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controlleradmin library
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Language_translations Controller
+ */
+class ComponentbuilderControllerLanguage_translations extends JControllerAdmin
+{
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS';
+	/**
+	 * Proxy for getModel.
+	 * @since	2.5
+	 */
+	public function getModel($name = 'Language_translation', $prefix = 'ComponentbuilderModel', $config = array())
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		
+		return $model;
+	}
+
+	public function exportData()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// check if export is allowed for this user.
+		$user = JFactory::getUser();
+		if ($user->authorise('language_translation.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
+		{
+			// Get the input
+			$input = JFactory::getApplication()->input;
+			$pks = $input->post->get('cid', array(), 'array');
+			// Sanitize the input
+			JArrayHelper::toInteger($pks);
+			// Get the model
+			$model = $this->getModel('Language_translations');
+			// get the data to export
+			$data = $model->getExportData($pks);
+			if (ComponentbuilderHelper::checkArray($data))
+			{
+				// now set the data to the spreadsheet
+				$date = JFactory::getDate();
+				ComponentbuilderHelper::xls($data,'Language_translations_'.$date->format('jS_F_Y'),'Language translations exported ('.$date->format('jS F, Y').')','language translations');
+			}
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error');
+		return;
+	}
+
+
+	public function importData()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// check if import is allowed for this user.
+		$user = JFactory::getUser();
+		if ($user->authorise('language_translation.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		{
+			// Get the import model
+			$model = $this->getModel('Language_translations');
+			// get the headers to import
+			$headers = $model->getExImPortHeaders();
+			if (ComponentbuilderHelper::checkObject($headers))
+			{
+				// Load headers to session.
+				$session = JFactory::getSession();
+				$headers = json_encode($headers);
+				$session->set('language_translation_VDM_IMPORTHEADERS', $headers);
+				$session->set('backto_VDM_IMPORT', 'language_translations');
+				$session->set('dataType_VDM_IMPORTINTO', 'language_translation');
+				// Redirect to import view.
+				$message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS');
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message);
+				return;
+			}
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error');
+		return;
+	}  
+}

admin/controllers/languages.php

@@ -0,0 +1,111 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 3 of this MVC
+	@build			3rd April, 2017
+	@created		3rd April, 2017
+	@package		Component Builder
+	@subpackage		languages.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla controlleradmin library
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Languages Controller
+ */
+class ComponentbuilderControllerLanguages extends JControllerAdmin
+{
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGES';
+	/**
+	 * Proxy for getModel.
+	 * @since	2.5
+	 */
+	public function getModel($name = 'Language', $prefix = 'ComponentbuilderModel', $config = array())
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		
+		return $model;
+	}
+
+	public function exportData()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// check if export is allowed for this user.
+		$user = JFactory::getUser();
+		if ($user->authorise('language.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
+		{
+			// Get the input
+			$input = JFactory::getApplication()->input;
+			$pks = $input->post->get('cid', array(), 'array');
+			// Sanitize the input
+			JArrayHelper::toInteger($pks);
+			// Get the model
+			$model = $this->getModel('Languages');
+			// get the data to export
+			$data = $model->getExportData($pks);
+			if (ComponentbuilderHelper::checkArray($data))
+			{
+				// now set the data to the spreadsheet
+				$date = JFactory::getDate();
+				ComponentbuilderHelper::xls($data,'Languages_'.$date->format('jS_F_Y'),'Languages exported ('.$date->format('jS F, Y').')','languages');
+			}
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
+		return;
+	}
+
+
+	public function importData()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		// check if import is allowed for this user.
+		$user = JFactory::getUser();
+		if ($user->authorise('language.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		{
+			// Get the import model
+			$model = $this->getModel('Languages');
+			// get the headers to import
+			$headers = $model->getExImPortHeaders();
+			if (ComponentbuilderHelper::checkObject($headers))
+			{
+				// Load headers to session.
+				$session = JFactory::getSession();
+				$headers = json_encode($headers);
+				$session->set('language_VDM_IMPORTHEADERS', $headers);
+				$session->set('backto_VDM_IMPORT', 'languages');
+				$session->set('dataType_VDM_IMPORTINTO', 'language');
+				// Redirect to import view.
+				$message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES');
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message);
+				return;
+			}
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
+		return;
+	}  
+}

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			22nd February, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			22nd February, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/template.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 40 of this MVC
-	@build			22nd February, 2017
+	@build			1st April, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 40 of this MVC
-	@build			22nd February, 2017
+	@build			1st April, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/custom/dropbox.php

@@ -464,4 +464,3 @@ class Dropbox
 		return function_exists('curl_version');
 	}
 }
-

admin/helpers/compiler.php

@@ -87,7 +87,7 @@ class Compiler extends Infusion
 				$this->removeFolder($this->componentPath . '/site');
 				// clear form component xml
 				$xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml';
-				$componentXML = JFile::read($xmlPath);
+				$componentXML = file_get_contents($xmlPath);
 				$textToSite = ComponentbuilderHelper::getBetween($componentXML,'<files folder="site">','</files>');
 				$textToSiteLang = ComponentbuilderHelper::getBetween($componentXML,'<languages folder="site">','</languages>');
 				$componentXML = str_replace(array('<files folder="site">'.$textToSite."</files>", '<languages folder="site">'.$textToSiteLang."</languages>"), array('',''), $componentXML);
@@ -136,7 +136,7 @@ class Compiler extends Infusion
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Compiler '.$nr.']';	
 		}
@@ -152,29 +152,21 @@ class Compiler extends Infusion
 	protected function updateFiles()
 	{
 		if (isset($this->newFiles['static']) && ComponentbuilderHelper::checkArray($this->newFiles['static']) && isset($this->newFiles['dynamic']) && ComponentbuilderHelper::checkArray($this->newFiles['dynamic']))
-		{			
-			// we don't update lang now since we will still posible add custom code
-			$langCheck = 'en-GB.com_'.$this->fileContentStatic['###component###'].'.';
+		{
 			// get the bom file
-			$bom = JFile::read($this->bomPath);
+			$bom = file_get_contents($this->bomPath);
 			// first we do the static files
 			foreach ($this->newFiles['static'] as $static)
 			{
 				if (JFile::exists($static['path']))
 				{
-					// skip lang files and store for later
-					if (strpos($static['path'], $langCheck))
-					{
-						$this->langFiles[] = $static;
-						continue;
-					}
 					$this->fileContentStatic['###FILENAME###'] = $static['name'];
 					$php = '';
 					if (ComponentbuilderHelper::checkFileType($static['name'],'php'))
 					{
 						$php = "<?php\n";
 					}
-					$string = JFile::read($static['path']);
+					$string = file_get_contents($static['path']);
 					if (strpos($string,'###BOM###') !== false)
 					{
 						list($wast,$code) = explode('###BOM###',$string);
@@ -211,7 +203,7 @@ class Compiler extends Infusion
 								{
 									$php = "<?php\n";
 								}
-								$string = JFile::read($file['path']);
+								$string = file_get_contents($file['path']);
 								if (strpos($string,'###BOM###') !== false)
 								{
 									list($bin,$code) = explode('###BOM###',$string);
@@ -364,7 +356,7 @@ class Compiler extends Infusion
 			$this->buildReadMeData();
 		}
 		// get the file
-		$string = JFile::read($path);
+		$string = file_get_contents($path);
 		// update the file
 		$answer = $this->setPlaceholders($string, $this->fileContentStatic);
 		// add to zip array

admin/helpers/compiler/a_Get.php

@@ -160,14 +160,21 @@ class Get
 	 * 
 	 * @var      boolean
 	 */
-	public $loadLineNr = false;
+	public $debugLinenr = false;	
+	
+	/*
+	 * The percentage when a language should be added
+	 * 
+	 * @var      boolean
+	 */
+	public $percentageLanguageAdd = 0;
 	
 	/**
-	 * The Language prefix
+	 * The Placholder Language prefix
 	 * 
 	 * @var      string
 	 */
-	public $langPrefix = 'COM_';
+	public $langPrefix;
 	
 	/**
 	 * The Language content
@@ -176,6 +183,34 @@ class Get
 	 */
 	public $langContent = array();
 	
+	/**
+	 * The Languages bucket
+	 * 
+	 * @var      array
+	 */
+	public $languages  = array('en-GB' => array());
+	
+	/**
+	 * The Multi Languages bucket
+	 * 
+	 * @var      array
+	 */
+	public $multiLangString = array();
+	
+	/**
+	 * The new lang to add
+	 * 
+	 * @var      array
+	 */
+	protected $newLangStrings = array();
+	
+	/**
+	 * The existing lang to update
+	 * 
+	 * @var      array
+	 */
+	protected $existingLangStrings = array();
+	
 	/**
 	 * The Component Code Name
 	 * 
@@ -441,7 +476,20 @@ class Get
 	 * @var    array
 	 */
 	public $siteFields = array();
-
+	
+	/**
+	 * The add SQL
+	 * 
+	 * @var    array
+	 */
+	public $addSQL = array();
+	
+	/**
+	 * The update SQL
+	 * 
+	 * @var    array
+	 */
+	public $updateSQL = array();
 
 	/***
 	 * Constructor
@@ -460,7 +508,7 @@ class Get
 			if ($name_code = ComponentbuilderHelper::getVar('joomla_component', $this->componentID, 'id', 'name_code'))
 			{
 				// set lang prefix
-				$this->langPrefix		.= ComponentbuilderHelper::safeString($name_code,'U');
+				$this->langPrefix		= 'COM_'.ComponentbuilderHelper::safeString($name_code,'U');
 				// set component code name
 				$this->componentCodeName	= ComponentbuilderHelper::safeString($name_code);
 				// set if placeholders should be added to customcode
@@ -468,7 +516,7 @@ class Get
 				$this->addPlaceholders		= ((int) $config['addPlaceholders'] == 0) ? false : (((int) $config['addPlaceholders'] == 1) ? true : $global);
 				// set if line numbers should be added to comments
 				$global = ((int) ComponentbuilderHelper::getVar('joomla_component', $this->componentID, 'id', 'debug_linenr') == 1) ? true:false;
-				$this->loadLineNr		= ((int) $config['debugLinenr'] == 0) ? false : (((int) $config['debugLinenr'] == 1) ? true : $global);
+				$this->debugLinenr		= ((int) $config['debugLinenr'] == 0) ? false : (((int) $config['debugLinenr'] == 1) ? true : $global);
 				// set the current user
 				$this->user			= JFactory::getUser();
 				// Get a db connection.
@@ -483,7 +531,30 @@ class Get
 				}
 				// get the component data
 				$this->componentData = $this->getComponentData();
-
+				// make sure we have a version
+				if (strpos($this->componentData->component_version, '.') === FALSE)
+				{
+					$this->componentData->component_version = '1.0.0';
+				}
+				// update the version
+				if (!isset($this->componentData->old_component_version) 
+					&& (ComponentbuilderHelper::checkArray($this->addSQL) || ComponentbuilderHelper::checkArray($this->updateSQL)))
+				{
+					// set the new version
+					$version = (array) explode('.', $this->componentData->component_version);
+					// get last key
+					end($version);
+					$key = key($version);
+					// just increment the last
+					$version[$key]++;
+					// set the old version
+					$this->componentData->old_component_version = $this->componentData->component_version;
+					// set the new version, and set update switch
+					$this->componentData->component_version = implode('.', $version);
+				}
+				// set the percentage when a language can be added
+				$this->percentageLanguageAdd = (int) $this->params->get('percentagelanguageadd', 50);
+				
 				return true;
 			}
 		}
@@ -500,7 +571,7 @@ class Get
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Get '.$nr.']';	
 		}
@@ -554,6 +625,7 @@ class Get
 			}
 			unset($component->addfolders);
 		}
+		
 		// ser the addfiles data
 		$addfiles	= json_decode($component->addfiles,true);
 		if (ComponentbuilderHelper::checkArray($addfiles))
@@ -620,6 +692,7 @@ class Get
 		
 		// set the admin_view data
 		$admin_views	= json_decode($component->addadmin_views,true);
+		
 		if (ComponentbuilderHelper::checkArray($admin_views))
 		{
 			foreach ($admin_views as $option => $values)
@@ -793,6 +866,25 @@ class Get
 					$component->version_update[$nr][$option] = $value;
 				}
 			}
+		}		
+		
+		// build update SQL
+		if ($old_component = $this->getHistoryWatch('joomla_component', $this->componentID))
+		{
+			// add new views if found
+			if (isset($old_component->addadmin_views) && ComponentbuilderHelper::checkJson($old_component->addadmin_views))
+			{
+				$this->setUpdateSQL(json_decode($old_component->addadmin_views, true), $admin_views, 'adminview');
+			}
+			// check if a new version was manualy set
+			$old_component_version = preg_replace('/[^0-9.]+/', '', $old_component->component_version);
+			if ($old_component_version != $this->component_version)
+			{
+				// yes, this is a new version, this mean there may be manual sql and must be checked and updated
+				$component->old_component_version = $old_component_version;
+			}
+			// clear this data
+			unset($old_component);
 		}
 
 		// add_css
@@ -1069,6 +1161,22 @@ class Get
 			unset($view->addlinked_views);
 			$tables			= json_decode($view->addtables,true);
 			unset($view->addtables);
+			// build update SQL
+			if ($old_view = $this->getHistoryWatch('admin_view', $id))
+			{
+				// add new fields were added
+				if (isset($old_view->addfields) && ComponentbuilderHelper::checkJson($old_view->addfields))
+				{
+					$this->setUpdateSQL(json_decode($old_view->addfields, true), $fields, 'field', $name_single);
+				}
+				// check if the view name changed
+				if (ComponentbuilderHelper::checkString($old_view->name_single))
+				{
+					$this->setUpdateSQL(ComponentbuilderHelper::safeString($old_view->name_single), $name_single, 'table_name', $name_single);
+				}				
+				// clear this data
+				unset($old_view);
+			}
 			// sort the values
 			if (ComponentbuilderHelper::checkArray($tables))
 			{
@@ -1393,6 +1501,7 @@ class Get
 					unset($view->sql);
 				}
 			}
+			// store this view to class object
 			$this->_adminViewData[$id] = $view;
 		}
 		// return the found view data
@@ -1652,6 +1761,9 @@ class Get
 					 $this->basicEncryption = true;
 				}
 				
+				// get the last used version
+				$field->history = $this->getHistoryWatch('field', $id);
+				
 				$this->_fieldData[$id] = $field;
 			}
 			else
@@ -2114,6 +2226,210 @@ class Get
 		return false;
 	}
 	
+	/**
+	 * check if an update SQL is needed
+	 * 
+	 * @param   mix      $old    The old values
+	 * @param   mix      $new    The new values
+	 * @param   string   $type   The type of values
+	 * @param   int      $key    The id/key where values changed
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setUpdateSQL($old, $new, $type, $key = null)
+	{
+		// check if there were new items added
+		if (isset($new[$type]) && ComponentbuilderHelper::checkArray($new[$type]) 
+			&& isset($old[$type]) && ComponentbuilderHelper::checkArray($old[$type]))
+		{
+			foreach ($new[$type] as $item)
+			{
+				if (!in_array($item, $old[$type]))
+				{
+					// we have a new item, lets add to SQL
+					if (!isset($this->addSQL[$type]) || !ComponentbuilderHelper::checkArray($this->addSQL[$type]))
+					{
+						$this->addSQL[$type] = array();
+					}
+					// add key if found
+					if ($key)
+					{
+						if (!isset($this->addSQL[$type][$key]) || !ComponentbuilderHelper::checkArray($this->addSQL[$type][$key]))
+						{
+							$this->addSQL[$type][$key] = array();
+						}
+						$this->addSQL[$type][$key][] = (int) $item;
+					}
+					else
+					{
+						// convert adminview id to name
+						if ('adminview' === $type)
+						{
+							$this->addSQL[$type][] = ComponentbuilderHelper::safeString($this->getAdminViewData($item)->name_single);
+						}
+						else
+						{
+							$this->addSQL[$type][] = (int) item;
+						}
+					}
+				}
+			}
+		}
+		elseif ($key && ComponentbuilderHelper::checkString($new) 
+			&& ComponentbuilderHelper::checkString($old)
+			&& $new !== $old)
+		{
+			// the string changed, lets add to SQL update
+			if (!isset($this->updateSQL[$type]) || !ComponentbuilderHelper::checkArray($this->updateSQL[$type]))
+			{
+				$this->updateSQL[$type] = array();
+			}
+			// set at key
+			$this->updateSQL[$type][$key] = array('old' => $old, 'new' => $new);			
+		}
+	}
+	
+	/**
+	 * Get Item History values
+	 * 
+	 * @param   string   $type  The type of item
+	 * @param   int      $id    The item ID
+	 *
+	 * @return  oject    The history
+	 * 
+	 */
+	protected function getHistoryWatch($type, $id)
+	{
+		// quick class object to store old history object
+		$this->tmpHistory = null;
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+
+		$query->select('h.*');
+		$query->from('#__ucm_history AS h');
+		$query->where($this->db->quoteName('h.ucm_item_id') . ' = '. (int) $id);
+		// Join over the content type for the type id
+		$query->join('LEFT', '#__content_types AS ct ON ct.type_id = h.ucm_type_id');
+		$query->where('ct.type_alias = ' . $this->db->quote('com_componentbuilder.'.$type));
+		$query->order('h.save_date DESC');
+		$this->db->setQuery($query, 0, 1);
+		$this->db->execute();
+		if ($this->db->getNumRows())
+		{
+			// new version of this item found
+			// so we need to mark it as the last compiled version
+			$newActive = $this->db->loadObject();
+			// set the new version watch
+			$this->setHistoryWatch($newActive, 1);
+		}
+		// Get last compiled verion
+		$query = $this->db->getQuery(true);
+
+		$query->select('h.*');
+		$query->from('#__ucm_history AS h');
+		$query->where($this->db->quoteName('h.ucm_item_id') . ' = ' . (int) $id);
+		$query->where('h.keep_forever = 1');
+		$query->where('h.version_note LIKE ' . $this->db->quote('%component%'));
+		// make sure it does not return the active version
+		if (isset($newActive) && isset($newActive->version_id))
+		{
+			$query->where('h.version_id != ' . (int) $newActive->version_id);
+		}
+		// Join over the content type for the type id
+		$query->join('LEFT', '#__content_types AS ct ON ct.type_id = h.ucm_type_id');
+		$query->where('ct.type_alias = ' . $this->db->quote('com_componentbuilder.'.$type));
+		$query->order('h.save_date DESC');
+		$this->db->setQuery($query);
+		$this->db->execute();
+		if ($this->db->getNumRows())
+		{
+			// the old active version was found
+			// so we may need to do an SQL update
+			// and unmark the old compiled version
+			$oldActives = $this->db->loadObjectList();
+			foreach ($oldActives as $oldActive)
+			{
+				// remove old version watch
+				$this->setHistoryWatch($oldActive, 0);
+			}
+		}
+		// return the last used history record or null.
+		return $this->tmpHistory;
+	}
+	
+	/**
+	 * Set Item History Watch
+	 * 
+	 * @param   Object   $object  The history object
+	 * @param   int      $action  The action to take
+	 *				0 = remove watch
+	 *				1 = add watch
+	 * @param   string   $type    The type of item
+	 *
+	 * @return  bool
+	 * 
+	 */
+	protected function setHistoryWatch($object, $action)
+	{
+		// check the note
+		if (ComponentbuilderHelper::checkJson($object->version_note))
+		{
+			$version_note = json_decode($object->version_note, true);
+		}
+		else
+		{
+			$version_note = array('component' => array());
+		}
+		// set watch
+		switch ($action)
+		{
+			case 0:
+				// remove watch
+				if(isset($version_note['component']) && ($key = array_search($this->componentID, $version_note['component'])) !== false)
+				{
+					// last version that was used to build/compile
+					$this->tmpHistory = json_decode($object->version_data);
+					// remove it from this component			
+					unset($version_note['component'][$key]);
+				}
+				else
+				{
+					// since it was not found, no need to update anything
+					return true;
+				}
+			break;
+			case 1:
+				// add watch
+				if (!in_array($this->componentID, $version_note['component']))
+				{
+					$version_note['component'][] = $this->componentID;
+				}
+				else
+				{
+					// since it is there already, no need to update anything
+					return true;
+				}
+			break;
+		}
+		// check if we need to still keep this locked
+		if (isset($version_note['component']) && ComponentbuilderHelper::checkArray($version_note['component']))
+		{
+			// insure component ids are only added once per item
+			$version_note['component'] = array_unique($version_note['component']);
+			// we may change this, little risky (but since JCB does not have history notes it should be okay for now)
+			$object->version_note = json_encode($version_note);
+			$object->keep_forever = '1';
+		}
+		else
+		{
+			$object->version_note = '';
+			$object->keep_forever = '0';
+		}
+		// run the update
+		return $this->db->updateObject('#__ucm_history', $object, 'version_id');
+	}
+	
 	/**
 	 * Set Template and Layout Data
 	 * 
@@ -2910,7 +3226,7 @@ class Get
 		}
 		else
 		{
-			if (!$keyPlaceholder = array_search($item['id'], $this->functionNameMemory))
+			if (($keyPlaceholder = array_search($item['id'], $this->functionNameMemory)) === false)
 			{
 				$keyPlaceholder = $item['id'];
 			}
@@ -2979,6 +3295,352 @@ class Get
 		unset($this->$remove);
 	}
 	
+	/**
+	 * Get the other languages
+	 * 
+	 * @param   array    $values  The lang strings to get
+	 * 
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function getMultiLangStrings($values)
+	{
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+		$query->from($this->db->quoteName('#__componentbuilder_language_translation','a'));
+		if (ComponentbuilderHelper::checkArray($values))
+		{
+			$query->select($this->db->quoteName(array('a.id','a.translation','a.entranslation','a.components','a.published')));
+			$query->where($this->db->quoteName('a.entranslation') . ' IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
+			$this->db->setQuery($query);
+			$this->db->execute();
+			if ($this->db->getNumRows())
+			{
+				return $this->db->loadAssocList('entranslation');
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Set the Current language values to DB
+	 * 
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function setLangPlaceholders($strings)
+	{
+		$counterInsert = 0;
+		$counterUpdate = 0;
+		$today = JFactory::getDate()->toSql();
+		foreach ($this->languages['en-GB'] as $area => $placeholders)
+		{
+			foreach ($placeholders as $placeholder => $string)
+			{
+				// to keep or remove
+				$remove = false;
+				// build the tranlations
+				if (ComponentbuilderHelper::checkString($string) && isset($this->multiLangString[$string]))
+				{
+					// make sure we have converted the string to array
+					if (isset($this->multiLangString[$string]['translation']) && ComponentbuilderHelper::checkJson($this->multiLangString[$string]['translation']))
+					{
+						$this->multiLangString[$string]['translation'] = json_decode($this->multiLangString[$string]['translation'], true);
+					}
+					// if we have an array continue
+					if (isset($this->multiLangString[$string]['translation']) 
+						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']) 
+						&& isset($this->multiLangString[$string]['translation']['translation'])
+						&& isset($this->multiLangString[$string]['translation']['language'])
+						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['language'])
+						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['translation']))
+					{
+						// great lets build the multi languages strings
+						foreach ($this->multiLangString[$string]['translation']['translation'] as $at => $lang)
+						{
+							$_tag = $this->multiLangString[$string]['translation']['language'][$at];
+							// build arrays
+							if (!isset($this->languages[$_tag]))
+							{
+								$this->languages[$_tag] = array();
+							}
+							if (!isset($this->languages[$_tag][$area]))
+							{
+								$this->languages[$_tag][$area] = array();
+							}
+							$this->languages[$_tag][$area][$placeholder] = $lang;
+						}
+					}
+					else
+					{
+						// remove this string not to be checked again
+						$remove = true;
+					}
+				}
+				// do the database managment
+				if(ComponentbuilderHelper::checkString($string) && ($key = array_search($string, $strings)) !== false)
+				{
+					if (isset($this->multiLangString[$string]))
+					{
+						// update the existing placeholder in db
+						$id = $this->multiLangString[$string]['id'];
+						if (ComponentbuilderHelper::checkJson($this->multiLangString[$string]['components']))
+						{
+							$components = (array) json_decode($this->multiLangString[$string]['components'], true);
+							// check if we should add the component ID
+							if (in_array($this->componentID, $components))
+							{
+								// only skip the update if the string is published and has the component ID
+								if ($this->multiLangString[$string]['published'] == 1)
+								{
+									continue;
+								}
+							}
+							else
+							{
+								$components[] = $this->componentID;
+							}
+						}
+						else
+						{
+							$components = array($this->componentID);
+						}
+						// start the bucket for this lang
+						$this->setUpdateExistingLangStrings($id, $components, 1, $today, $counterUpdate);
+
+						$counterUpdate++;
+
+						// load to db 
+						$this->setExistingLangStrings(50);
+						// remove string if needed
+						if ($remove)
+						{
+							unset($this->multiLangString[$string]);
+						}
+					}
+					else
+					{
+						// add the new lang placeholder to the db
+						$this->newLangStrings[$counterInsert]	= array();
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote(json_encode(array($this->componentID)));	// 'components'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote($string);					// 'entranslation'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote(1);						// 'published'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote($today);					// 'created'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote((int) $this->user->id);			// 'created_by'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote(1);						// 'version'
+						$this->newLangStrings[$counterInsert][]	= $this->db->quote(1);						// 'access'
+
+						$counterInsert++;
+
+						// load to db 
+						$this->setNewLangStrings(100);
+					}
+					// only set the string once
+					unset($strings[$key]);
+				}
+			}
+		}
+		// just to make sure all is done
+		$this->setExistingLangStrings();
+		$this->setNewLangStrings();
+	}
+	
+	/**
+	 * store the language placeholders
+	 * 
+	 * @param   int	     $when  To set when to update
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setNewLangStrings($when = 1)
+	{
+		if (count($this->newLangStrings) >= $when)
+		{
+			// Create a new query object.
+			$query = $this->db->getQuery(true);
+			$continue = false;
+			// Insert columns.
+			$columns = array('components','entranslation','published','created','created_by','version','access');
+			// Prepare the insert query.
+			$query->insert($this->db->quoteName('#__componentbuilder_language_translation'));
+			$query->columns($this->db->quoteName($columns));
+			foreach($this->newLangStrings as $values)
+			{
+				if (count($values) == 7)
+				{
+					$query->values(implode(',', $values));
+					$continue = true;
+				}
+				else
+				{
+					// TODO line mismatch... should not happen
+				}
+			}
+			// clear the values array
+			$this->newLangStrings = array();
+			if (!$continue)
+			{
+				return false; // insure we dont continue if no values were loaded
+			}
+			// Set the query using our newly populated query object and execute it.
+			$this->db->setQuery($query);
+			$this->db->execute();
+		}
+	} 
+	
+	/**
+	 * update the language placeholders
+	 * 
+	 * @param   int      $when  To set when to update
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setExistingLangStrings($when = 1)
+	{
+		if (count($this->existingLangStrings) >= $when)
+		{
+			foreach($this->existingLangStrings as $values)
+			{
+				// Create a new query object.
+				$query = $this->db->getQuery(true);
+				// Prepare the update query.
+				$query->update($this->db->quoteName('#__componentbuilder_language_translation'))->set($values['fields'])->where($values['conditions']);
+				// Set the query using our newly populated query object and execute it.
+				$this->db->setQuery($query);
+				$this->db->execute();
+			}
+			// clear the values array
+			$this->existingLangStrings = array();            
+		}
+	} 
+	
+	/**
+	 * Remove exiting language translation stings
+	 * 
+	 * @param   int      $id  To string ID to remove
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function removeExitingLangString($id)
+	{
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+ 
+		// delete all custom keys for user 1001.
+		$conditions = array(
+		    $this->db->quoteName('id') . ' = ' . (int) $id
+		);
+
+		$query->delete($this->db->quoteName('#__componentbuilder_language_translation'));
+		$query->where($conditions);
+
+		$this->db->setQuery($query);
+		$this->db->execute();
+	}
+	
+	/**
+	 * Function to purge the unused languge strings
+	 * 
+	 * @param   string    $values  the active strings
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function purgeLanuageStrings($values)
+	{
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+		$query->from($this->db->quoteName('#__componentbuilder_language_translation','a'));
+		$query->select($this->db->quoteName(array('a.id','a.translation','a.components')));
+		// get all string that are not linked to this component
+		$query->where($this->db->quoteName('a.entranslation') . ' NOT IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
+		$query->where($this->db->quoteName('a.published') . ' = 1');
+		$this->db->setQuery($query);
+		$this->db->execute();
+		if ($this->db->getNumRows())
+		{
+			$counterUpdate = 0;
+			$otherStrings = $this->db->loadAssocList();
+			$today = JFactory::getDate()->toSql();
+			foreach ($otherStrings as $item)
+			{
+				if (ComponentbuilderHelper::checkJson($item['components']))
+				{
+					$components = (array) json_decode($item['components'], true);
+					// if component is not found ignore this string, and do nothing
+					if (($key = array_search($this->componentID, $components)) !== false)
+					{
+						// first remove the component from the string
+						unset($components[$key]);
+						// check if there are more components
+						if (ComponentbuilderHelper::checkArray($components))
+						{
+							// just update the string to unlink the current component
+							$this->setUpdateExistingLangStrings($item['id'], $components, 1, $today, $counterUpdate);
+
+							$counterUpdate++;
+
+							// load to db 
+							$this->setExistingLangStrings(50);
+						}
+						// check if this string has been worked on
+						elseif (ComponentbuilderHelper::checkJson($item['translation']))
+						{
+							$translation = json_decode($item['translation'], true);
+							if (ComponentbuilderHelper::checkArray($translation) && ComponentbuilderHelper::checkArray($translation['translation']))
+							{
+								// only archive the item and update the string to unlink the current component
+								$this->setUpdateExistingLangStrings($item['id'], $components, 2, $today, $counterUpdate);
+
+								$counterUpdate++;
+
+								// load to db 
+								$this->setExistingLangStrings(50);
+							}
+							else
+							{
+								// remove the string since no translation found and not linked to any other component
+								$this->removeExitingLangString($item['id']);
+							}
+						}
+						else
+						{
+							// remove the string since no translation found and not linked to any other component
+							$this->removeExitingLangString($item['id']);
+						}
+					}
+				}
+			}
+			// load to db 
+			$this->setExistingLangStrings();
+		}
+	}
+	
+	/**
+	 * just to add lang string to the existing Lang Strings array
+	 * 
+	 * @return  void
+	 * 
+	 */
+	protected function setUpdateExistingLangStrings($id, $components, $published, $today, $counterUpdate)
+	{
+		// start the bucket for this lang
+		$this->existingLangStrings[$counterUpdate]			= array();
+		$this->existingLangStrings[$counterUpdate]['id']		= (int) $id;
+		$this->existingLangStrings[$counterUpdate]['conditions']	= array();
+		$this->existingLangStrings[$counterUpdate]['conditions'][]	= $this->db->quoteName('id') . ' = ' . $this->db->quote($id);
+		$this->existingLangStrings[$counterUpdate]['fields']		= array();
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('components') . ' = ' . $this->db->quote(json_encode($components));
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('published') . ' = ' . $this->db->quote($published);
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('modified') . ' = ' . $this->db->quote($today);
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('modified_by') . ' = ' . $this->db->quote((int) $this->user->id);
+	}
+	
 	/**
 	 * get the custom code from the system
 	 * 

admin/helpers/compiler/b_Structure.php

@@ -359,7 +359,7 @@ class Structure extends Get
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Structure '.$nr.']';	
 		}
@@ -721,16 +721,19 @@ class Structure extends Get
 	 */
 	public function getLastModifiedDate($view)
 	{
-		if (isset($view['settings']->modified) && ComponentbuilderHelper::checkString($view['settings']->modified))
+		// first set the main date
+		if (isset($view['settings']->modified) 
+			&& ComponentbuilderHelper::checkString($view['settings']->modified) 
+			&& '0000-00-00 00:00:00' !== $view['settings']->modified)
 		{
-			// first set the main date
 			$date = strtotime($view['settings']->modified);
 		}
 		else
 		{
-			// first set the main date
+			// use todays date
 			$date = strtotime("now");
 		}
+		// search for the last modified date
 		if (isset($view['adminview']))
 		{
 			$id = $view['adminview'].'admin';
@@ -741,7 +744,9 @@ class Structure extends Get
 				{
 					foreach ($view['settings']->fields as $field)
 					{
-						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) && isset($field['settings']->modified))
+						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) 
+							&& isset($field['settings']->modified) && ComponentbuilderHelper::checkString($field['settings']->modified) 
+							&& '0000-00-00 00:00:00' !== $field['settings']->modified)
 						{
 							$anotherDate = strtotime($field['settings']->modified);
 							if ($anotherDate > $date)
@@ -759,7 +764,9 @@ class Structure extends Get
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified))
+				if (isset($view['settings']->main_get->modified)
+					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
+					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)
@@ -775,7 +782,9 @@ class Structure extends Get
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified))
+				if (isset($view['settings']->main_get->modified)
+					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
+					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)

admin/helpers/compiler/c_Fields.php

@@ -229,6 +229,13 @@ class Fields extends Structure
 	 */
 	public $jsonStringBuilder = array();
 	
+	/**
+	 * Json String Builder for return values to array
+	 * 
+	 * @var    array
+	 */
+	public $jsonItemBuilderArray = array();
+	
 	/**
 	 * Json Item Builder
 	 * 
@@ -351,7 +358,7 @@ class Fields extends Structure
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Fields '.$nr.']';	
 		}
@@ -761,8 +768,8 @@ class Fields extends Structure
 				}
 				elseif ($this->defaultField($typeName, 'special'))
 				{
-					// set the repeatable field
-					if ($typeName === 'repeatable')
+					// set the repeatable field or subform field
+					if ($typeName === 'repeatable' || $typeName === 'subform')
 					{
 						if ($build)
 						{
@@ -957,12 +964,12 @@ class Fields extends Structure
 				if (strpos($fieldAttributes['fields'], ',') !== false)
 				{
 					// mulitpal fields
-					$fieldsSets = explode(',', $fieldAttributes['fields']);
+					$fieldsSets = (array) explode(',', $fieldAttributes['fields']);
 				}
-				else
+				elseif (is_numeric($fieldAttributes['fields']))
 				{
 					// single field
-					$fieldsSets[] = $fieldAttributes['fields'];
+					$fieldsSets[] = (int) $fieldAttributes['fields'];
 				}
 				// only continue if we have a field set
 				if (ComponentbuilderHelper::checkArray($fieldsSets))
@@ -1026,6 +1033,93 @@ class Fields extends Structure
 				$fieldSet .= PHP_EOL."\t\t\t</fields>";
 				$fieldSet .= PHP_EOL."\t\t</field>";
 			}
+			// set the subform fields (it is a repeatable without the modal) 
+			elseif ($typeName === 'subform')
+			{
+				// now add to the field set
+				$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$fieldSet .= PHP_EOL."\t\t<field";
+				$fieldsSet = array();
+				foreach ($fieldAttributes as $property => $value)
+				{
+					if ($property != 'fields')
+					{
+						$fieldSet .= PHP_EOL."\t\t\t" . $property . '="' . $value . '"';
+					}
+				}
+				$fieldSet .= ">";
+				$fieldSet .= PHP_EOL."\t\t\t" . '<form hidden="true" name="list_' . $fieldAttributes['name'] . '_modal" repeat="true">';
+				if (strpos($fieldAttributes['fields'], ',') !== false)
+				{
+					// mulitpal fields
+					$fieldsSets = (array) explode(',', $fieldAttributes['fields']);
+				}
+				elseif (is_numeric($fieldAttributes['fields']))
+				{
+					// single field
+					$fieldsSets[] = (int) $fieldAttributes['fields'];
+				}
+				// only continue if we have a field set
+				if (ComponentbuilderHelper::checkArray($fieldsSets))
+				{
+					foreach ($fieldsSets as $fieldId)
+					{
+						// get the field data
+                                                $fieldData = array();
+						$fieldData['settings'] = $this->getFieldData($fieldId, $viewName);
+						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
+						{
+							$r_name = ComponentbuilderHelper::safeString($fieldData['settings']->name);
+							$r_typeName = ComponentbuilderHelper::safeString($fieldData['settings']->type_name);
+							$r_multiple = false;
+							$r_langLabel = '';
+							// add the tabs needed
+							$taber = "\t\t";
+							// get field values
+							$r_fieldValues = $this->setFieldAttributes($fieldData, $view, $r_name, $r_typeName, $r_multiple, $r_langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders, true);
+							// check if values were set
+							if (ComponentbuilderHelper::checkArray($r_fieldValues))
+							{
+								//reset options array
+								$r_optionArray = array();
+								if ($this->defaultField($r_typeName, 'option'))
+								{
+									// now add to the field set
+									$fieldSet .= $this->setField('option', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+								}
+								elseif ($this->defaultField($r_typeName, 'plain'))
+								{
+									// now add to the field set
+									$fieldSet .= $this->setField('plain', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+								}
+								elseif (ComponentbuilderHelper::checkArray($r_fieldValues['custom']))
+								{
+									// add to custom
+									$custom = $r_fieldValues['custom'];
+									unset($r_fieldValues['custom']);
+									// now add to the field set
+									$fieldSet .= $this->setField('custom', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+									// set lang (just incase)
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									// add to lang array
+									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									// if label was set use instead
+									if (ComponentbuilderHelper::checkString($r_langLabel))
+									{
+										$r_listLangName = $r_langLabel;
+									}
+									// set the custom array
+									$data = array('type' => $r_typeName, 'code' => $r_name, 'lang' => $r_listLangName, 'custom' => $custom);
+									// set the custom field file
+									$this->setCustomFieldTypeFile($data, $listViewName, $viewName);
+								}
+							}
+						}
+					}
+				}
+				$fieldSet .= PHP_EOL."\t\t\t</form>";
+				$fieldSet .= PHP_EOL."\t\t</field>";
+			}
 		}
 		elseif ($setType === 'custom')
 		{
@@ -1665,6 +1759,8 @@ class Fields extends Structure
                                 $this->queryBuilder[$viewName][$name]['lenght_other']   = $field['settings']->datalenght_other;
                                 $this->queryBuilder[$viewName][$name]['default']        = $field['settings']->datadefault;
                                 $this->queryBuilder[$viewName][$name]['other']          = $field['settings']->datadefault_other;
+				// to identify the field
+                                $this->queryBuilder[$viewName][$name]['ID']		= $field['settings']->id;
                         }
                         else
                         {
@@ -1727,7 +1823,7 @@ class Fields extends Structure
 			}
 		}
 		// build the list values
-		if ($field['list'] == 1 && $typeName != 'repeatable')
+		if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 		{
 			// load to list builder
 			$this->listBuilder[$listViewName][] = array(
@@ -1763,7 +1859,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
+		if ($typeName != 'category' && $typeName != 'repeatable' && $typeName != 'subform' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@@ -1788,9 +1884,9 @@ class Fields extends Structure
 			}
 		}
 		// set the custom builder
-		if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable')
+		if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable' && $typeName != 'subform')
 		{
-			$this->customBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom);
+			$this->customBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'method' => $field['settings']->store);
 			// set the custom fields needed in content type data
 			if (!isset($this->customFieldLinksBuilder[$viewName]))
 			{
@@ -1834,7 +1930,7 @@ class Fields extends Structure
 			$this->checkboxBuilder[$viewName][] = $name;
 		}
 		// setup checkboxes and other json items for this view
-		if (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag')
+		if (($typeName === 'subform' || $typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag')
 		{
 			switch ($field['settings']->store)
 			{
@@ -1876,7 +1972,7 @@ class Fields extends Structure
 			}
 
 			// load the json list display fix
-			if ($field['list'] == 1 && $typeName != 'repeatable')
+			if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 			{
 				if (ComponentbuilderHelper::checkArray($options))
 				{
@@ -1887,6 +1983,12 @@ class Fields extends Structure
 					$this->getItemsMethodListStringFixBuilder[$viewName][] = array('name' => $name, 'type' => $typeName, 'translation' => false, 'custom' => $custom, 'method' => $field['settings']->store);
 				}
 			}
+			
+			// if subform the values must revert to array
+			if ('subform' === $typeName)
+			{
+				$this->jsonItemBuilderArray[$viewName][] = $name;
+			}
 		}
 		// build the data for the export & import methods $typeName === 'repeatable' ||
 		if (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && !ComponentbuilderHelper::checkArray($options))
@@ -1897,12 +1999,12 @@ class Fields extends Structure
 		// check if field should be added to uikit
 		$this->buildSiteFieldData($viewName, $name, 'uikit', $typeName);
 		// load the selection translation fix
-		if (ComponentbuilderHelper::checkArray($options) && $field['list'] == 1 && $typeName != 'repeatable')
+		if (ComponentbuilderHelper::checkArray($options) && $field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 		{
 			$this->selectionTranslationFixBuilder[$listViewName][$name] = $options;
 		}
 		// build the sort values
-		if ($field['sort'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable'))
+		if ($field['sort'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->sortBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'options' => $options);
 		}
@@ -1912,7 +2014,7 @@ class Fields extends Structure
 			$this->searchBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $field['list']);
 		}
 		// build the filter values
-		if ($field['filter'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable'))
+		if ($field['filter'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->filterBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'database' => $viewName, 'function' => ComponentbuilderHelper::safeString($name, 'F'), 'custom' => $custom, 'options' => $options);
 		}
@@ -2069,7 +2171,7 @@ class Fields extends Structure
 			'chromestyle', 'contenttype', 'databaseconnection', 'editors', 'email', 'file',
 			'filelist', 'folderlist', 'groupedlist', 'hidden', 'file', 'headertag', 'helpsite',
 			'imagelist', 'integer', 'language', 'list', 'media', 'menu', 'note', 'number', 'password',
-			'plugins', 'radio', 'repeatable', 'range', 'rules', 'sessionhandler', 'spacer', 'sql', 'tag',
+			'plugins', 'radio', 'repeatable', 'range', 'rules', 'subform', 'sessionhandler', 'spacer', 'sql', 'tag',
 			'tel', 'menuitem', 'meter', 'modulelayout', 'moduleorder', 'moduleposition', 'moduletag',
 			'templatestyle', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
 		    ),
@@ -2090,7 +2192,7 @@ class Fields extends Structure
 		    ),
 		    'special' => array(
 			'contentlanguage', 'groupedlist', 'moduleposition', 'plugin',
-			'repeatable', 'templatestyle'
+			'repeatable', 'templatestyle', 'subform'
 		    )
 		);
 

admin/helpers/compiler/e_Interpretation.php

@@ -33,6 +33,7 @@ class Interpretation extends Fields
 {	
 	public $theContributors			= '';
 	public $uninstallBuilder		= array();
+	public $updateSQLBuilder		= array();
 	public $listColnrBuilder		= array();
 	public $permissionBuilder		= array();
 	public $permissionDashboard		= array();
@@ -75,7 +76,7 @@ class Interpretation extends Fields
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Interpretation '.$nr.']';	
 		}
@@ -522,8 +523,7 @@ class Interpretation extends Fields
 	
 	public function setVersionController()
 	{
-		$updateServer = '';
-		if (ComponentbuilderHelper::checkArray($this->componentData->version_update))
+		if (ComponentbuilderHelper::checkArray($this->componentData->version_update) || ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
 		{
 			$updateXML = array();
 			// add the update server
@@ -531,52 +531,34 @@ class Interpretation extends Fields
 			{
 				$updateXML[] = '<updates>';
 			}
-			// add the update sql
-			$addSQL = true;
-			foreach ($this->componentData->version_update as $update)
+			
+			// add the dynamic sql switch
+			$addDynamicSQL = true;
+			$addActive = true;
+			if (ComponentbuilderHelper::checkArray($this->componentData->version_update))
 			{
-				// ensure version naming is correct
-				$update['version'] = preg_replace('/[^0-9.]+/', '', $update['version']);
-				// check if the sql should be added
-				if ($update['version'] == $this->componentData->component_version)
+				foreach ($this->componentData->version_update as $nr => &$update)
 				{
-					$addSQL = false;
-				}
-				// setup import files
-				if ($addSQL)
-				{
-					$name = ComponentbuilderHelper::safeString($update['version']);
-					$target = array('admin' => $name);
-					$this->buildDynamique($target,'sql_update',$update['version']);
-					$this->fileContentDynamic[$name.'_'.$update['version']]['###UPDATE_VERSION_MYSQL###'] = $update['mysql'];
-				}
-				// add the update server
-				if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
-				{
-					// build update xml
-					$updateXML[] = "\t<update>";
-					$updateXML[] = "\t\t<name>".$this->fileContentStatic['###Component_name###']."</name>";
-					$updateXML[] = "\t\t<description>".$this->fileContentStatic['###SHORT_DESCRIPTION###']."</description>";
-					$updateXML[] = "\t\t<element>com_".$this->fileContentStatic['###component###']."</element>";
-					$updateXML[] = "\t\t<type>component</type>";
-					$updateXML[] = "\t\t<version>".$update['version']."</version>";
-					$updateXML[] = "\t\t".'<infourl title="'.$this->fileContentStatic['###Component_name###'].'!">'.$this->fileContentStatic['###AUTHORWEBSITE###'].'</infourl>';
-					$updateXML[] = "\t\t<downloads>";
-					if (!isset($update['url']))
+					$this->setUpdateXMLSQL($update, $updateXML, $addDynamicSQL);
+					
+					if ($update['version'] == $this->componentData->component_version)
 					{
-						$update['url'] = 'http://domain.com/demo.xml';
+						$addActive = false;
 					}
-					$updateXML[] = "\t\t\t".'<downloadurl type="full" format="zip">'.$update['url'].'</downloadurl>';
-					$updateXML[] = "\t\t</downloads>";
-					$updateXML[] = "\t\t<tags>";
-					$updateXML[] = "\t\t\t<tag>stable</tag>";
-					$updateXML[] = "\t\t</tags>";
-					$updateXML[] = "\t\t<maintainer>".$this->fileContentStatic['###AUTHOR###']."</maintainer>";
-					$updateXML[] = "\t\t<maintainerurl>".$this->fileContentStatic['###AUTHORWEBSITE###']."</maintainerurl>";
-					$updateXML[] = "\t\t".'<targetplatform name="joomla" version="3.*"/>';
-					$updateXML[] = "\t</update>";
 				}
 			}
+			// add the dynamic sql if not already added
+			if ($addDynamicSQL && ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
+			{
+				// add the dynamic sql
+				$this->setDynamicUpdateXMLSQL($updateXML);
+			}
+			// add the new active version if needed
+			if ($addActive && ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
+			{
+				// add the dynamic sql
+				$this->setDynamicUpdateXMLSQL($updateXML, $addActive);
+			}
 			// add the update server file
 			if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
 			{
@@ -604,6 +586,141 @@ class Interpretation extends Fields
 		}
 		// add update server details to component XML file
 		$this->fileContentStatic['###UPDATESERVER###'] = $updateServer;
+		// ensure to update Component version data
+		if (ComponentbuilderHelper::checkArray($this->updateSQLBuilder))
+		{
+			$buket = array();
+			$buket['version'] = array();
+			$buket['mysql'] = array();
+			$buket['url'] = array();
+			foreach ($this->componentData->version_update as $values)
+			{
+				foreach ($values as $key => $value)
+				{
+					$buket[$key][] = $value;
+				}
+			}
+			$new = array();
+			$new['id'] = (int) $this->componentID;
+			$new['component_version'] = $this->componentData->component_version;
+			$new['version_update'] = json_encode($buket);
+			// update the component with the new dynamic SQL
+			$model = ComponentbuilderHelper::getModel('joomla_component');
+			$model->save($new); // <-- to insure the history is also updated
+			// reset the watch here
+			$this->getHistoryWatch('joomla_component', $this->componentID);
+		}
+	}	
+	
+	public function setDynamicUpdateXMLSQL(&$updateXML, $current_version = false)
+	{
+		// start building the update
+		$update_ = array();
+		if ($current_version)
+		{
+			// setup new version
+			$update_['version'] = $this->componentData->component_version;
+			// setup SQL
+			$update_['mysql'] = '';
+			// setup URL
+			$update_['url'] = 'http://domain.com/demo.zip';
+		}
+		else
+		{
+			// setup new version
+			$update_['version'] = $this->componentData->old_component_version;
+			// setup SQL
+			$update_['mysql'] = trim(implode(PHP_EOL.PHP_EOL, $this->updateSQLBuilder));
+			// setup URL
+			if (isset($this->lastupdateURL))
+			{
+				$paceholders = array(
+					$this->componentData->component_version => $this->componentData->old_component_version,
+					str_replace('.','-', $this->componentData->component_version) => str_replace('.','-', $this->componentData->old_component_version),
+					str_replace('.','_', $this->componentData->component_version) => str_replace('.','_', $this->componentData->old_component_version),
+					str_replace('.','', $this->componentData->component_version) => str_replace('.','', $this->componentData->old_component_version)
+				);
+				$update_['url'] = $this->setPlaceholders($this->lastupdateURL, $paceholders);
+			}
+			else
+			{
+				// setup URL
+				$update_['url'] = 'http://domain.com/demo.zip';
+			}
+		}
+		// stop it from being added double
+		$addDynamicSQL = false;
+		$this->componentData->version_update[] = $update_;
+		// add dynamic SQL
+		$this->setUpdateXMLSQL($update_, $updateXML, $addDynamicSQL);
+	}
+	
+	public function setUpdateXMLSQL(&$update, &$updateXML, &$addDynamicSQL)
+	{
+		// ensure version naming is correct
+		$update['version'] = preg_replace('/[^0-9.]+/', '', $update['version']);
+		// setup SQL
+		if (ComponentbuilderHelper::checkString($update['mysql']))
+		{
+			$update['mysql'] = $this->setPlaceholders($update['mysql'], $this->placeholders);
+		}
+		// add dynamic SQL
+		$force = false;
+		if ($addDynamicSQL && ComponentbuilderHelper::checkArray($this->updateSQLBuilder)
+			&& (isset($this->componentData->old_component_version) && $this->componentData->old_component_version == $update['version']))
+		{
+			$searchMySQL = preg_replace('/\s+/', '', $update['mysql']);
+			// add the updates to the SQL only if not found
+			foreach ($this->updateSQLBuilder as $search => $query)
+			{
+				if (strpos($searchMySQL, $search) === FALSE)
+				{
+					$update['mysql'] .= PHP_EOL.PHP_EOL.$query;
+				}
+			}
+			// make sure no unneeded white space is added
+			$update['mysql'] = trim($update['mysql']);
+			// update has been added
+			$addDynamicSQL = false;
+		}
+		// setup import files
+		if ($update['version'] != $this->componentData->component_version)
+		{
+			$name = ComponentbuilderHelper::safeString($update['version']);
+			$target = array('admin' => $name);
+			$this->buildDynamique($target,'sql_update',$update['version']);
+			$this->fileContentDynamic[$name.'_'.$update['version']]['###UPDATE_VERSION_MYSQL###'] = $update['mysql'];
+		}
+		elseif (isset($update['url']) && ComponentbuilderHelper::checkString($update['url']))
+		{
+			$this->lastupdateURL = $update['url'];
+		}
+		// add the update server
+		if ($this->componentData->add_update_server && $this->componentData->update_server_target != 3)
+		{
+			// build update xml
+			$updateXML[] = "\t<update>";
+			$updateXML[] = "\t\t<name>".$this->fileContentStatic['###Component_name###']."</name>";
+			$updateXML[] = "\t\t<description>".$this->fileContentStatic['###SHORT_DESCRIPTION###']."</description>";
+			$updateXML[] = "\t\t<element>com_".$this->fileContentStatic['###component###']."</element>";
+			$updateXML[] = "\t\t<type>component</type>";
+			$updateXML[] = "\t\t<version>".$update['version']."</version>";
+			$updateXML[] = "\t\t".'<infourl title="'.$this->fileContentStatic['###Component_name###'].'!">'.$this->fileContentStatic['###AUTHORWEBSITE###'].'</infourl>';
+			$updateXML[] = "\t\t<downloads>";
+			if (!isset($update['url']) || !ComponentbuilderHelper::checkString($update['url']))
+			{
+				$update['url'] = 'http://domain.com/demo.zip';
+			}
+			$updateXML[] = "\t\t\t".'<downloadurl type="full" format="zip">'.$update['url'].'</downloadurl>';
+			$updateXML[] = "\t\t</downloads>";
+			$updateXML[] = "\t\t<tags>";
+			$updateXML[] = "\t\t\t<tag>stable</tag>";
+			$updateXML[] = "\t\t</tags>";
+			$updateXML[] = "\t\t<maintainer>".$this->fileContentStatic['###AUTHOR###']."</maintainer>";
+			$updateXML[] = "\t\t<maintainerurl>".$this->fileContentStatic['###AUTHORWEBSITE###']."</maintainerurl>";
+			$updateXML[] = "\t\t".'<targetplatform name="joomla" version="3.*"/>';
+			$updateXML[] = "\t</update>";
+		}
 	}
 
 	public function noHelp()
@@ -1609,7 +1726,7 @@ class Interpretation extends Fields
 					$value = " ".$whe['value_key']."');";
 
 				}
-				elseif (strpos($whe['value_key'],'$this->') !== false)
+				elseif (strpos($whe['value_key'],'$') !== false)
 				{
 					if ($whe['operator'] === 'IN' || $whe['operator'] === 'NOT IN')
 					{
@@ -1622,21 +1739,29 @@ class Interpretation extends Fields
 				}
 				elseif (strpos($whe['value_key'],'.') !== false)
 				{
-					$value = " ".$whe['value_key']."');";
+					if (strpos($whe['value_key'],"'") !== false)
+					{
+						$value = " ' . \$db->quote(".$whe['value_key']."));";
+					}
+					else
+					{
+						$value = " ".$whe['value_key']."');";
+					}
 				}
 				// only load if there is a value
 				if (ComponentbuilderHelper::checkString($value))
 				{
+					$tabe = '';
+					if ($as === 'a')
+					{
+						$tabe = $tab;
+					}
 					// set the string
 					if ($whe['operator'] === 'IN' || $whe['operator'] === 'NOT IN')
 					{
-						$tabe = '';
-						if ($as === 'a')
-						{
-							$tabe = $tab;
-						}
 						$string = "if (isset(" . $whe['value_key']. ") && ".$this->fileContentStatic['###Component###']."Helper::checkArray(" . $whe['value_key']. "))";
 						$string .= PHP_EOL."\t".$tabe."\t{";
+						$string .= PHP_EOL."\t".$tabe."\t\t\//".$this->setLine(__LINE__)." Get where ".$whe['table_key']." is " . $whe['value_key'];
 						$string .= PHP_EOL."\t".$tabe."\t\t\$query->where('".$whe['table_key']." ".$whe['operator'].$value;
 						$string .= PHP_EOL."\t".$tabe."\t}";
 						$string .= PHP_EOL."\t".$tabe."\telse";
@@ -1647,7 +1772,8 @@ class Interpretation extends Fields
 					}
 					else
 					{
-						$string = "\$query->where('".$whe['table_key']." ".$whe['operator'].$value;
+						$string = "//".$this->setLine(__LINE__)." Get where ".$whe['table_key']." is " . $whe['value_key'];
+						$string .= PHP_EOL."\t".$tabe."\t\$query->where('".$whe['table_key']." ".$whe['operator'].$value;
 					}
 					// sort where
 					if ($as === 'a' || (isset($this->siteMainGet[$this->target][$code][$as]) && ComponentbuilderHelper::checkString($this->siteMainGet[$this->target][$code][$as])))
@@ -3456,10 +3582,16 @@ class Interpretation extends Fields
 			$makeArray = '';
 			foreach ($this->jsonStringBuilder[$view] as $jsonString)
 			{
-			$script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$jsonString."))";
+				$script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$jsonString."))";
 				$script .= PHP_EOL."\t\t\t{";
 				$script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." JSON Decode ".$jsonString.".";
-				if (strpos($jsonString, 'group') !== false)
+				if (isset($this->jsonItemBuilderArray[$view])
+					&& ComponentbuilderHelper::checkArray($this->jsonStringBuilderArray[$view])
+					&& in_array($jsonString, $this->jsonItemBuilderArray[$view]))
+				{
+					$makeArray = ',true';
+				}
+				elseif (strpos($jsonString, 'group') !== false)
 				{
 					$makeArray = ',true';
 				}
@@ -4117,6 +4249,7 @@ class Interpretation extends Fields
 	public function routerParseSwitch(&$view, $viewArray = null, $aliasView = true, $idView = true)
 	{
 		$isCategory = '';
+		$viewTable = false;
 		if ($viewArray && ComponentbuilderHelper::checkArray($viewArray))
 		{
 			if (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main === 'categories')
@@ -4128,29 +4261,25 @@ class Interpretation extends Fields
 //				$idView = false; // TODO we will keep an eye on this....
 //				$aliasView = false;
 //			}
-//			elseif (isset($viewArray['settings']->main_get->main_get) && ComponentbuilderHelper::checkArray($viewArray['settings']->main_get->main_get))
-//			{
-//				$aliasView = false;
-//				foreach ($viewArray['settings']->main_get->main_get as $get)
-//				{
-//					if ($get['as'] === 'a')
-//					{
-//						if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection'])
-//							&& isset($get['selection']['select_gets']) 
-//							&& ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
-//						{
-//							foreach ($get['selection']['select_gets'] as $checkAlias)
-//							{
-//								if ($checkAlias === "'a.alias'")
-//								{
-//									$aliasView = true;
-//								}
-//							}
-//						}
-//						
-//					}
-//				}
-//			}
+			elseif (isset($viewArray['settings']->main_get->main_get) && ComponentbuilderHelper::checkArray($viewArray['settings']->main_get->main_get))
+			{
+				foreach ($viewArray['settings']->main_get->main_get as $get)
+				{
+					if ($get['as'] === 'a')
+					{
+						if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection'])
+							&& isset($get['selection']['select_gets']) 
+							&& ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
+						{
+							if (isset($get['selection']['table']))
+							{
+								$viewTable = str_replace('#__'.$this->fileContentStatic['###component###'].'_', '', $get['selection']['table']);
+							}
+						}
+						
+					}
+				}
+			}
 		}
 		// add if tags is added, also for all front item views
 		if ($aliasView)
@@ -4166,7 +4295,15 @@ class Interpretation extends Fields
 			$routerSwitch[] = "\t\t\t\t}";
 			$routerSwitch[] = "\t\t\t\telseif (\$segments[\$count-1])";
 			$routerSwitch[] = "\t\t\t\t{";
-			$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");";
+			// we need to get from the table of this views main get the alias so we need the table name
+			if ($viewTable)
+			{
+				$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$viewTable."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");";
+			}
+			else
+			{
+				$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");";
+			}
 			$routerSwitch[] = "\t\t\t\t\tif(\$id)";
 			$routerSwitch[] = "\t\t\t\t\t{";
 			$routerSwitch[] = "\t\t\t\t\t\t\$vars['id'] = \$id;";
@@ -4823,15 +4960,24 @@ class Interpretation extends Fields
 				// build the uninstall array
 				$this->uninstallBuilder[] = "DROP TABLE IF EXISTS `#__".$component."_".$view."`;";
 
-				// setup the tables
-				$db .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
+				// setup the table DB string
+				$db_ = '';
+				$db_ .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
+				// check if the table name has changed
+				if (isset($this->updateSQL['table_name']) && isset($this->updateSQL['table_name'][$view]))
+				{
+					$old_table_name = $this->updateSQL['table_name'][$view]['old'];
+					$this->updateSQLBuilder["RENAMETABLE`#__".$component."_".$old_table_name."`"] 
+						= "RENAME TABLE `#__".$component."_".$old_table_name."` to `#__".$component."_".$view."`;";
+				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['id']))
 				{
-					$db .= PHP_EOL."\t`id` INT(11) NOT NULL AUTO_INCREMENT,";
+					$db_ .= PHP_EOL."\t`id` INT(11) NOT NULL AUTO_INCREMENT,";
 				}
-				$db .= PHP_EOL."\t`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',";
+				$db_ .= PHP_EOL."\t`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',";
 				ksort($fields);
+				$last_name = 'asset_id';
 				foreach ($fields as $field => $data)
 				{
 					// set default
@@ -4850,7 +4996,14 @@ class Interpretation extends Fields
 					}
 					elseif ($default == 0 || $default)
 					{
-						$default = $data['null_switch']." DEFAULT '".$default."'";
+						if (is_numeric($default))
+						{
+							$default = $data['null_switch']." DEFAULT ".$default;
+						}
+						else
+						{
+							$default = $data['null_switch']." DEFAULT '".$default."'";
+						}
 					}
 					elseif ($data['null_switch'] === 'NULL')
 					{
@@ -4871,116 +5024,142 @@ class Interpretation extends Fields
 						$lenght = '('.$data['lenght'].')';
 					}
 					// set the field to db
-					$db .= PHP_EOL."\t`".$field."` ".$data['type'].$lenght." ".$default.",";
+					$db_ .= PHP_EOL."\t`".$field."` ".$data['type'].$lenght." ".$default.",";
+					// check if this a new field that should be added via SQL update
+					if (isset($this->addSQL['field']) && isset($this->addSQL['field'][$view]) 
+						&& ComponentbuilderHelper::checkArray($this->addSQL['field'][$view])
+						&& in_array($data['ID'], $this->addSQL['field'][$view]))
+					{
+						$this->updateSQLBuilder["ALTERTABLE`#__".$component."_".$view."`ADD`".$field."`"] 
+							= "ALTER TABLE `#__".$component."_".$view."` ADD `".$field."` ".$data['type'].$lenght." ".$default." AFTER `".$last_name."`;";
+					}
+					// check if the field has changed name and/or data type and lenght
+					elseif (0)
+					{
+						// hmmm tough one
+					}
+					// be sure to track the last name used :)
+					$last_name = $field;
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['params']))
 				{
-					$db .= PHP_EOL."\t`params` text NOT NULL DEFAULT '',";
+					$db_ .= PHP_EOL."\t`params` text NOT NULL DEFAULT '',";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['published']))
 				{
-					$db .= PHP_EOL."\t`published` TINYINT(3) NOT NULL DEFAULT 1,";
+					$db_ .= PHP_EOL."\t`published` TINYINT(3) NOT NULL DEFAULT 1,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['created_by']))
 				{
-					$db .= PHP_EOL."\t`created_by` INT(10) unsigned NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`created_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['modified_by']))
 				{
-					$db .= PHP_EOL."\t`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['created']))
 				{
-					$db .= PHP_EOL."\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+					$db_ .= PHP_EOL."\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['modified']))
 				{
-					$db .= PHP_EOL."\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+					$db_ .= PHP_EOL."\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['checked_out']))
 				{
-					$db .= PHP_EOL."\t`checked_out` int(11) unsigned NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`checked_out` int(11) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['checked_out_time']))
 				{
-					$db .= PHP_EOL."\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+					$db_ .= PHP_EOL."\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['version']))
 				{
-					$db .= PHP_EOL."\t`version` INT(10) unsigned NOT NULL DEFAULT 1,";
+					$db_ .= PHP_EOL."\t`version` INT(10) unsigned NOT NULL DEFAULT 1,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['hits']))
 				{
-					$db .= PHP_EOL."\t`hits` INT(10) unsigned NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`hits` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
-					$db .= PHP_EOL."\t`access` INT(10) unsigned NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`access` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['ordering']))
 				{
-					$db .= PHP_EOL."\t`ordering` INT(11) NOT NULL DEFAULT 0,";
+					$db_ .= PHP_EOL."\t`ordering` INT(11) NOT NULL DEFAULT 0,";
 				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
 				{
-					$db .= PHP_EOL."\t`metakey` TEXT NOT NULL DEFAULT '',";
-					$db .= PHP_EOL."\t`metadesc` TEXT NOT NULL DEFAULT '',";
-					$db .= PHP_EOL."\t`metadata` TEXT NOT NULL DEFAULT '',";
+					$db_ .= PHP_EOL."\t`metakey` TEXT NOT NULL DEFAULT '',";
+					$db_ .= PHP_EOL."\t`metadesc` TEXT NOT NULL DEFAULT '',";
+					$db_ .= PHP_EOL."\t`metadata` TEXT NOT NULL DEFAULT '',";
 				}
-				$db .= PHP_EOL."\tPRIMARY KEY  (`id`)";
+				$db_ .= PHP_EOL."\tPRIMARY KEY  (`id`)";
 				if (isset($this->dbUniqueKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbUniqueKeys[$view]))
 				{
 					foreach ($this->dbUniqueKeys[$view] as $nr => $key)
 					{
-						$db .= ",".PHP_EOL."\tUNIQUE KEY `idx_".$key."` (`".$key."`)";
+						$db_ .= ",".PHP_EOL."\tUNIQUE KEY `idx_".$key."` (`".$key."`)";
 					}
 				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
-					$db .= ",".PHP_EOL."\tKEY `idx_access` (`access`)";
+					$db_ .= ",".PHP_EOL."\tKEY `idx_access` (`access`)";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['checked_out']))
 				{
-					$db .= ",".PHP_EOL."\tKEY `idx_checkout` (`checked_out`)";
+					$db_ .= ",".PHP_EOL."\tKEY `idx_checkout` (`checked_out`)";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['created_by']))
 				{
-					$db .= ",".PHP_EOL."\tKEY `idx_createdby` (`created_by`)";
+					$db_ .= ",".PHP_EOL."\tKEY `idx_createdby` (`created_by`)";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['modified_by']))
 				{
-					$db .= ",".PHP_EOL."\tKEY `idx_modifiedby` (`modified_by`)";
+					$db_ .= ",".PHP_EOL."\tKEY `idx_modifiedby` (`modified_by`)";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['published']))
 				{
-					$db .= ",".PHP_EOL."\tKEY `idx_state` (`published`)";
+					$db_ .= ",".PHP_EOL."\tKEY `idx_state` (`published`)";
 				}
 				if (isset($this->dbKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbKeys[$view]))
 				{
 					foreach ($this->dbKeys[$view] as $nr => $key)
 					{
-						$db .= ",".PHP_EOL."\tKEY `idx_".$key."` (`".$key."`)";
+						$db_ .= ",".PHP_EOL."\tKEY `idx_".$key."` (`".$key."`)";
 					}
 				}
-				$db .= PHP_EOL.") ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;".PHP_EOL.PHP_EOL;
+				$db_ .= PHP_EOL.") ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;";
+				
+				// check if this is a new table that should be added via update SQL
+				if (isset($this->addSQL['adminview']) && ComponentbuilderHelper::checkArray($this->addSQL['adminview'])
+					&& in_array($view, $this->addSQL['adminview']))
+				{
+					// build the update array
+					$this->updateSQLBuilder["CREATETABLEIFNOTEXISTS`#__".$component."_".$view."`"] = $db_;
+				}
+				
+				// add to main DB string
+				$db .= $db_.PHP_EOL.PHP_EOL;
 			}
 			// add custom sql dump to the file
 			if (isset($this->customScriptBuilder['sql']) && ComponentbuilderHelper::checkArray($this->customScriptBuilder['sql']))
@@ -4988,7 +5167,7 @@ class Interpretation extends Fields
 				foreach ($this->customScriptBuilder['sql'] as $for => $customSql)
 				{
 					$placeholders = array('[[[component]]]' => $component, '[[[view]]]' => $for);
-					$db .= PHP_EOL.PHP_EOL.$this->setPlaceholders($customSql, $placeholders);
+					$db .= $this->setPlaceholders($customSql, $placeholders).PHP_EOL.PHP_EOL;
 				}
 
 			}
@@ -5092,20 +5271,14 @@ class Interpretation extends Fields
 		if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin']))
 		{
 			ksort($this->langContent['admin']);
-			foreach ($this->langContent['admin'] as $key => $value)
-			{
-				if (strlen($key) > 0)
-				{
-					if (!isset($lang))
-					{
-						$lang = '';
-					}
-					$lang .= $key.'="'.$value.'"'.PHP_EOL;
-				}
-			}
-			return $lang;
+			// load to global languages
+			$this->languages['en-GB']['admin'] = $this->langContent['admin'];
+			// remove tmp array
+			unset($this->langContent['admin']);
+			
+			return true;
 		}
-		return '';
+		return false;
 	}
 
 	public function setLangSite()
@@ -5133,7 +5306,7 @@ class Interpretation extends Fields
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
 		{
-			foreach ($this->langContent[$this->lang] as $keylang => $langval)
+			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
 				$this->langContent['site'][$keylang] = $langval;
 			}
@@ -5141,20 +5314,14 @@ class Interpretation extends Fields
 		if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site']))
 		{
 			ksort($this->langContent['site']);
-			foreach ($this->langContent['site'] as $key => $value)
-			{
-				if (strlen($key) > 0)
-				{
-					if (!isset($lang))
-					{
-						$lang = '';
-					}
-					$lang .= $key.'="'.$value.'"'.PHP_EOL;
-				}
-			}
-			return $lang;
+			// load to global languages
+			$this->languages['en-GB']['site'] = $this->langContent['site'];
+			// remove tmp array
+			unset($this->langContent['site']);
+			
+			return true;
 		}
-		return '';
+		return false;
 	}
 
 	public function setLangSiteSys()
@@ -5165,20 +5332,14 @@ class Interpretation extends Fields
 		if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys']))
 		{
 			ksort($this->langContent['sitesys']);
-			foreach ($this->langContent['sitesys'] as $key => $value)
-			{
-				if (strlen($key) > 0)
-				{
-					if (!isset($lang))
-					{
-						$lang = '';
-					}
-					$lang .= $key.'="'.$value.'"'.PHP_EOL;
-				}
-			}
-			return $lang;
+			// load to global languages
+			$this->languages['en-GB']['sitesys'] = $this->langContent['sitesys'];
+			// remove tmp array
+			unset($this->langContent['sitesys']);
+			
+			return true;
 		}
-		return '';
+		return false;
 	}
 
 	public function setLangAdminSys()
@@ -5186,20 +5347,14 @@ class Interpretation extends Fields
 		if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys']))
 		{
 			ksort($this->langContent['adminsys']);
-			foreach ($this->langContent['adminsys'] as $key => $value)
-			{
-				if (strlen($key) > 0)
-				{
-					if (!isset($lang))
-					{
-						$lang = '';
-					}
-					$lang .= $key.'="'.$value.'"'.PHP_EOL;
-				}
-			}
-			return $lang;
+			// load to global languages
+			$this->languages['en-GB']['adminsys'] = $this->langContent['adminsys'];
+			// remove tmp array
+			unset($this->langContent['adminsys']);
+			
+			return true;
 		}
-		return '';
+		return false;
 	}
 
 	public function setCustomAdminViewListLink($view,$viewName_list)
@@ -5753,8 +5908,7 @@ class Interpretation extends Fields
 				$linkedViewId = '';
 				if (ComponentbuilderHelper::checkArray($linkedTab))
 				{
-					$linkedViewId = array_search($tabNr,$linkedTab);
-					if ($linkedViewId)
+					if (($linkedViewId = array_search($tabNr, $linkedTab)) !== false)
 					{
 						// don't build
 						$buildLayout = false;
@@ -5890,10 +6044,14 @@ class Interpretation extends Fields
 			$span = '';
 			if ($mainwidth != 12)
 			{
-				$span = ' span'.$mainwidth;
+				$span = 'span'.$mainwidth;
 			}
 			// start building body
-			$body = '<div class="form-horizontal'.$span.'">';
+			$body = PHP_EOL.'<div class="form-horizontal">';
+			if (ComponentbuilderHelper::checkString($span))
+			{
+				$body .= PHP_EOL."\t".'<div class="'.$span.'">';
+			}
 			// now build the template
 			foreach ($bucket as $tabCodeName => $posions)
 			{
@@ -5949,7 +6107,7 @@ class Interpretation extends Fields
 				if(isset($linkedViewIdentifier) && ComponentbuilderHelper::checkArray($linkedViewIdentifier) && in_array($tabCodeName,$linkedViewIdentifier))
 				{
 					// get view name
-					$linkedViewId = array_search($tabCodeName,$linkedViewIdentifier);
+					$linkedViewId = array_search($tabCodeName, $linkedViewIdentifier);
 					$linkedViewData = $this->getAdminViewData($linkedViewId);
 					$linkedCodeName = ComponentbuilderHelper::safeString($linkedViewData->name_single);
 					// setup correct core target
@@ -6181,6 +6339,7 @@ class Interpretation extends Fields
 			$body .= PHP_EOL."\t\t".'<input type="hidden" name="task" value="'.$viewName_single.'.edit" />';
 			$body .= PHP_EOL."\t\t<?php echo JHtml::_('form.token'); ?>";
 			$body .= PHP_EOL."\t</div>";
+			$body .= PHP_EOL."\t</div>";
 			$body .= PHP_EOL."</div>";
 			// check if left has been set
 			if (strlen($leftside) > 0 )
@@ -6820,8 +6979,8 @@ class Interpretation extends Fields
 	 * @param $parentKey
 	 * @param $parent_key
 	 * @param $globalKey
-     * @return string
-     */
+	 * @return string
+	 */
 	public function setListQueryLinked($viewName_single, $viewName_list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey)
 	{
 		// check if this view has category added
@@ -6924,7 +7083,7 @@ class Interpretation extends Fields
 			$query .= PHP_EOL."\t\t\t\t\tif (isset(\$item->".$field.") && ".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$field."))";
 			$query .= PHP_EOL."\t\t\t\t\t{";
 			$query .= PHP_EOL."\t\t\t\t\t\t\$tmpArray = json_decode(\$item->".$field.",true);";
-			$query .= PHP_EOL."\t\t\t\t\t\tif (!in_array(\$this->".$globalKey.", \$tmpArray['".$target."']))";
+			$query .= PHP_EOL."\t\t\t\t\t\tif (!isset(\$tmpArray['".$target."']) || !".$this->fileContentStatic['###Component###']."Helper::checkArray(\$tmpArray['".$target."']) || !in_array(\$this->".$globalKey.", \$tmpArray['".$target."']))";
 			$query .= PHP_EOL."\t\t\t\t\t\t{";
 			$query .= PHP_EOL."\t\t\t\t\t\t\tunset(\$items[\$nr]);";
 			$query .= PHP_EOL."\t\t\t\t\t\t\tcontinue;";
@@ -7206,7 +7365,7 @@ class Interpretation extends Fields
 			$query .= PHP_EOL."\t\t\tif (\$db->getNumRows())";
 			$query .= PHP_EOL."\t\t\t{";
 			$query .= PHP_EOL."\t\t\t\t\$items = \$db->loadObjectList();";
-			$query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t\t",true);
+			$query .= $this->setGetItemsMethodStringFix($viewName_single, $this->fileContentStatic['###Component###'], "\t\t", true);
                         // add custom php to getitems method after all
                         $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL.PHP_EOL."\t\t");
 			$query .= PHP_EOL."\t\t\t\treturn \$items;";
@@ -7572,7 +7731,8 @@ class Interpretation extends Fields
 					&& ComponentbuilderHelper::checkArray($this->customBuilderList[$viewName_list]) 
 					&& in_array($filter['code'],$this->customBuilderList[$viewName_list])
 					&& isset($filter['custom']['table']) 
-					&& ComponentbuilderHelper::checkString($filter['custom']['table']))
+					&& ComponentbuilderHelper::checkString($filter['custom']['table'])
+					&& $filter['method'] == 0)
 				{
 					$query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." From the ".ComponentbuilderHelper::safeString(ComponentbuilderHelper::safeString($filter['custom']['table'],'w'))." table.";
 					$query .= PHP_EOL."\t\t\$query->select(\$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'));";
@@ -10643,7 +10803,7 @@ class Interpretation extends Fields
 		return $checkin;
 	}
 
-	public function setGetItemsMethodStringFix($view,$Component,$tab = '',$export = false)
+	public function setGetItemsMethodStringFix($view, $Component, $tab = '', $export = false)
 	{
 		// add the fix if this view has the need for it
 		$fix = '';
@@ -10849,7 +11009,15 @@ class Interpretation extends Fields
 						{
 							// TODO we check if this works well.
 							$fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
-							$fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
+							if (isset($item['custom']['table']))
+							{
+								$keyTableNAme = str_replace('#__'.$this->fileContentStatic['###component###'] .'_', '', $item['custom']['table']);
+								$fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$keyTableNAme."');";
+							}
+							else
+							{
+								$fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
+							}
 						}
 						else
 						{
@@ -11260,7 +11428,7 @@ class Interpretation extends Fields
 				$builder[$data['name']][$data['header']] = $this->setPlaceholders($data['html'], $this->placeholders);
 			}
 			// since we have custom tabs we must load the tab structure around the cpanel
-			$display[] = '<div id="j-main-container" class="span12">';
+			$display[] = '<div id="j-main-container">';
 			$display[] = "\t".'<div class="form-horizontal">';
 			$display[] = "\t<?php echo JHtml::_('bootstrap.startTabSet', 'cpanel_tab', array('active' => 'cpanel')); ?>";
 			$display[] = PHP_EOL."\t\t<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'cpanel', JText::_('cPanel', true)); ?>";

admin/helpers/compiler/f_Infusion.php

@@ -61,7 +61,7 @@ class Infusion extends Interpretation
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Infusion '.$nr.']';	
 		}
@@ -192,8 +192,6 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###HELP###'] = $this->noHelp();
 			// ###HELP_SITE###
 			$this->fileContentStatic['###HELP_SITE###'] = $this->noHelp();
-			// ###UPDATE_VERSION_MYSQL###
-			$this->setVersionController();
 
 			// build route parse switch
 			$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] = '';
@@ -760,6 +758,9 @@ class Infusion extends Interpretation
 
                         // ###UNINSTALL###
                         $this->fileContentStatic['###UNINSTALL###'] = $this->setUninstall();
+			
+			// ###UPDATE_VERSION_MYSQL###
+			$this->setVersionController();
 
                         // ###DASHBOARDICONS###
                         $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons();
@@ -1067,33 +1068,130 @@ class Infusion extends Interpretation
 	 * @return  boolean  on success
 	 * 
 	 */
-	
 	public function setLangFileData()
 	{
-		// First we build the strings
-		$lang = array();
-		// ###LANG_ADMIN###
-		$lang['###LANG_ADMIN###'] = $this->setLangAdmin();
-		// ###LANG_ADMIN_SYS###
-		$lang['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
-		// ###LANG_SITE###
-		$lang['###LANG_SITE###'] = $this->setLangSite();
-		// ###LANG_SITE_SYS###
-		$lang['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
-		// now we insert the values into the files
-		if (ComponentbuilderHelper::checkArray($this->langFiles))
+		$values = array();
+		$mainLangLoader = array();
+		// check the admin lang is set
+		if ($this->setLangAdmin())
 		{
-			foreach ($this->langFiles as $file)
+			$values[] = array_values($this->languages['en-GB']['admin']);
+			$mainLangLoader['admin'] = count($this->languages['en-GB']['admin']);
+		}
+		// check the admin system lang is set
+		if ($this->setLangAdminSys())
+		{
+			$values[] = array_values($this->languages['en-GB']['adminsys']);
+			$mainLangLoader['adminsys'] = count($this->languages['en-GB']['adminsys']);
+		}
+		// check the site lang is set
+		if (!$this->removeSiteFolder && $this->setLangSite())
+		{
+			$values[] = array_values($this->languages['en-GB']['site']);
+			$mainLangLoader['site'] = count($this->languages['en-GB']['site']);
+		}
+		// check the site system lang is set
+		if (!$this->removeSiteFolder && $this->setLangSiteSys())
+		{
+			$values[] = array_values($this->languages['en-GB']['sitesys']);
+			$mainLangLoader['sitesys'] = count($this->languages['en-GB']['sitesys']);
+		}
+		$values = array_unique(ComponentbuilderHelper::mergeArrays($values));
+		// get the other lang strings if there is any
+		$this->multiLangString = $this->getMultiLangStrings($values);
+		// update insert the current lang in to DB
+		$this->setLangPlaceholders($values);
+		// remove old unused language strings
+		$this->purgeLanuageStrings($values);
+		// path to INI file
+		$getPAth = $this->templatePath . '/en-GB.com_admin.ini';
+		// now we insert the values into the files
+		if (ComponentbuilderHelper::checkArray($this->languages))
+		{
+			$langXML = array();
+			foreach ($this->languages as $tag => $areas)
 			{
-				$string = JFile::read($file['path']);
-				// load the data
-				$answer = $this->setPlaceholders($string, $lang, 3);
-				// add to zip array
-				$this->writeFile($file['path'],$answer);
-				// set the line counter
-				$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL);
+				foreach ($areas as $area => $languageStrings)
+				{
+					// force load if debug lines are added
+					if (!$this->debugLinenr)
+					{
+						// check if we sould install this translation
+						$dif = bcdiv(count($languageStrings), $mainLangLoader[$area]);
+						$percentage = bcmul($dif, 100);
+						if ($percentage < $this->percentageLanguageAdd)
+						{
+							// dont add
+							continue;
+						}
+					}
+					$p = 'admin';
+					$t = '';
+					if (strpos($area, 'site') !== false)
+					{
+						if ($this->removeSiteFolder)
+						{
+							continue;
+						}
+						$p = 'site';
+					}
+					if (strpos($area, 'sys') !== false)
+					{
+						$t = '.sys';
+					}
+					// build the path to to place the lang file
+					$path = $this->componentPath.'/'.$p.'/language/'.$tag;
+					if (!JFolder::exists($path))
+					{
+						JFolder::create($path);
+						// count the folder created
+						$this->folderCount++;
+					}
+					// build the file name
+					$fileName = $tag . '.com_' . $this->componentCodeName . $t . '.ini';
+					// move the file to its place
+					JFile::copy($getPAth, $path.'/'.$fileName);
+					// count the file created
+					$this->fileCount++;
+					// add content to it
+					$lang = '';
+					foreach ($languageStrings as $place => $string)
+					{
+						$lang .= $place.'="'.$string.'"'.PHP_EOL;
+					}
+					// add to language file
+					$this->writeFile($path.'/'.$fileName, $lang);
+					// set the line counter
+					$this->lineCount = $this->lineCount + substr_count($lang, PHP_EOL);
+					// build xml strings
+					if (!isset($langXML[$p]))
+					{
+						$langXML[$p] = array();
+					}
+					$langXML[$p][] = '<language tag="'.$tag.'">language/'.$tag.'/'.$fileName.'</language>';
+				}
+			}
+			// load the lang xml 
+			if (ComponentbuilderHelper::checkArray($langXML))
+			{
+				$replace = array();
+				if (isset($langXML['admin']) && ComponentbuilderHelper::checkArray($langXML['admin']))
+				{
+					$replace['###ADMIN_LANGUAGES###'] = implode(PHP_EOL."\t\t\t", $langXML['admin']);
+				}
+				if (!$this->removeSiteFolder && isset($langXML['site']) && ComponentbuilderHelper::checkArray($langXML['site']))
+				{
+					$replace['###SITE_LANGUAGES###'] = implode(PHP_EOL."\t\t", $langXML['site']);
+				}
+				// build xml path
+				$xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml';
+				// get the content in xml
+				$componentXML = file_get_contents($xmlPath);
+				// update the xml content
+				$componentXML = $this->setPlaceholders($componentXML, $replace);
+				// store the values back to xml
+				$this->writeFile($xmlPath,$componentXML);
 			}
 		}
 	}
-
 }

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -30,7 +30,16 @@ defined('_JEXEC') or die('Restricted access');
  * Componentbuilder component helper.
  */
 abstract class ComponentbuilderHelper
-{ 
+{
+
+	/**
+	*	The Global Admin Event Method.
+	**/
+	public static function globalEvent($document)
+	{
+		// the Session keeps track of all data related to the current session of this user
+		self::loadSession();
+	} 
 
 	/*
 	 * Autoloader
@@ -1065,7 +1074,64 @@ abstract class ComponentbuilderHelper
 		}
 		return false;
 	}
-			 
+			
+	/**
+	* 	set the session defaults if not set
+	**/
+	protected static function setSessionDefaults()
+	{
+		// noting for now
+		return true;
+	}
+			
+	/**
+	* 	the Butler
+	**/
+	public static $session = array();
+
+	/**
+	* 	the Butler Assistant 
+	**/
+	protected static $localSession = array();
+
+	/**
+	* 	start a session if not already set, and load with data
+	**/
+	public static function loadSession()
+	{
+		if (!isset(self::$session) || !self::checkObject(self::$session))
+		{
+			self::$session = JFactory::getSession();
+		}
+		// set the defaults
+		self::setSessionDefaults();
+	}
+
+	/**
+	* 	give Session more to keep
+	**/
+	public static function set($key, $value)
+	{
+		// set to local memory to speed up program
+		self::$localSession[$key] = $value;
+		// load to session for later use
+		return self::$session->set($key, self::$localSession[$key]);
+	}
+
+	/**
+	* 	get info from Session
+	**/
+	public static function get($key, $default = null)
+	{
+		// check if in local memory
+		if (!isset(self::$localSession[$key]))
+		{
+			// set to local memory to speed up program
+			self::$localSession[$key] = self::$session->get($key, $default);
+		}
+		return self::$localSession[$key];
+	}
+			  
 	/**
 	*	Load the Component xml manifest.
 	**/
@@ -1245,6 +1311,14 @@ abstract class ComponentbuilderHelper
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES'), 'index.php?option=com_componentbuilder&view=fieldtypes', $submenu === 'fieldtypes');
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.fieldtypes', $submenu === 'categories.fieldtypes');
 		}
+		if ($user->authorise('language_translation.access', 'com_componentbuilder') && $user->authorise('language_translation.submenu', 'com_componentbuilder'))
+		{
+			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_TRANSLATIONS'), 'index.php?option=com_componentbuilder&view=language_translations', $submenu === 'language_translations');
+		}
+		if ($user->authorise('language.access', 'com_componentbuilder') && $user->authorise('language.submenu', 'com_componentbuilder'))
+		{
+			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_LANGUAGES'), 'index.php?option=com_componentbuilder&view=languages', $submenu === 'languages');
+		}
 		if ($user->authorise('help_document.access', 'com_componentbuilder') && $user->authorise('help_document.submenu', 'com_componentbuilder'))
 		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_componentbuilder&view=help_documents', $submenu === 'help_documents');
@@ -2145,7 +2219,8 @@ abstract class ComponentbuilderHelper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}

admin/helpers/headercheck.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -696,6 +696,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out"
 COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter."
 COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time."
+COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work will be lost, are you sure you want to continue?"
 COM_COMPONENTBUILDER_ALWAYS_INSURE_THAT_YOU_HAVE_YOUR_LOCAL_COMPONENTS_BACKED_UP_BY_MAKING_AN_EXPORT_OF_ALL_YOUR_LOCAL_COMPONENTS_BEFORE_IMPORTING_ANY_NEW_COMPONENTS_SMALLMAKE_BSUREB_TO_MOVE_THIS_ZIPPED_BACKUP_PACKAGE_OUT_OF_THE_TMP_FOLDER_BEFORE_DOING_AN_IMPORTSMALLBR_IF_YOU_ARE_IMPORTING_A_PACKAGE_OF_A_THREERD_PARTY_JCB_PACKAGE_DEVELOPER_BMAKE_SURE_IT_IS_A_REPUTABLE_JCB_PACKAGE_DEVELOPERSB="Always insure that you have your local components backed up, by making an export of all your local components before importing any new components. <small>(Make <b>SURE</b> to move this zipped backup package out of the tmp folder before doing an import)</small><br />If you are importing a package of a 3rd party JCB package developer, <b>make sure it is a reputable JCB package developers!</b>"
 COM_COMPONENTBUILDER_AUTHOR="Author"
 COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading"
@@ -713,15 +714,19 @@ COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="<b>Dynamic get</b> id:%s
 COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!"
 COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="<b>Field in %s</b> has id mismatch of selected <b>field</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="<b>Field type</b> id:%s mismatch in <b>%s</b>."
+COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="<b>Field type</b> not set for <b>%s</b>."
 COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="<b>Get the key from</b> <a class="btn btn-primary" href="%s" target="_blank" title="get a key from %s">%s</a>"
 COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="<b>Images</b> not move to correct location!"
 COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BVIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="<b>Join view table in %s</b> has id mismatch of selected <b>view table</b>. So the id:%s was removed!"
-COM_COMPONENTBUILDER_BLINKED_ADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_NOT_UPDATED="<b>Linked admin view in %s</b> has id mismatch of selected <b>admin view</b>. So the id:%s was not updated!"
+COM_COMPONENTBUILDER_BLINKED_VIEWB_IDS_MISMATCH_IN_BADMIN_VIEWSB_AND_WAS_EMREMOVEDEM_FROM_THE_LINKED_VIEWS="<b>Linked view</b> id:%s mismatch in <b>admin view:%s</b>, and was <em>removed</em> from the linked views."
 COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="<b>Main get</b> id:%s mismatch in <b>%s</b>."
+COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="<b>Main get</b> not set for <b>%s</b>."
+COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="<b>Repeatable</b> id:%s mismatch in <b>field:%s</b>, and was <em>removed</em> from the field."
 COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="<b>%s</b> could not be imported%s"
 COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="<b>%s</b> <em>component details</em>"
 COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="<b>%s</b> has id mismatch of selected <b>field</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Site view in %s</b> has id mismatch of selected <b>site view</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="<b>Snippet</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="<b>View table main</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp"
 COM_COMPONENTBUILDER_COMPANY="Company"
@@ -789,12 +794,9 @@ COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
 COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encription key for the field encryption is set here."
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where you JCB package keys can be bought"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought."
 COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_DESCRIPTION="Enter query string to use in building the buy url [http://www.example.com/buy-keys&package=JCB_demo]"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_HINT="&package="
-COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_QUERY_LABEL="Buy Query string"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION="Enter Company Name Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_HINT="Company Name Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL="Company Name"
@@ -810,12 +812,6 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL="License"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_DESCRIPTION="The Owner's Name &amp; Surname."
 COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_HINT="Owner Name &amp; Surname Here"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_LABEL="Owner"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_DESCRIPTION="Enter link where you latest JCB package can be found"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_HINT="http://www.example.com/buy-package"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_LINK_LABEL="Package Link<br /><small>(to get updated package)</small>"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_DESCRIPTION="Enter query string to use in building the package url [http://www.example.com/buy-package&package=JCB_demo]"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_HINT="&package="
-COM_COMPONENTBUILDER_CONFIG_EXPORT_PACKAGE_QUERY_LABEL="Package Query string"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
@@ -840,6 +836,8 @@ COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL="Moving The Custom Fol
 COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION="You must set the folder where all the components should be deployed for git. You will have to still do your git commit and other git commands yourself. Each component will create their own folder inside this git folder."
 COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL="Adding git to your compiler method"
 COM_COMPONENTBUILDER_CONFIG_ONLY_EXTRA="Only Extra"
+COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION="Select percentage any language should be translated before the system should add the language to the component during compilation."
+COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL="Add Language if %? ready."
 COM_COMPONENTBUILDER_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
 for developing fast and powerful web interfaces. For more info visit <a href="http://getuikit.com/" >http://getuikit.com/</a>"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_LABEL="Uikit Settings"
@@ -1333,7 +1331,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see placeholder]</code></span><br />You can also pass values to this code like this: <span id='jcb-placeholder-arg'><code>[save to see placeholder trick]</code></span> <br />Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arge1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]<br />Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.<br />Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI. <br />This note will change once we have resolved these limitations."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder."
-COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div class='span6'>
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div class='form-horizontal'><div class='span6'>
 <h1>Understand how the placeholders work in (IDE)</h1>
 <div id='phpjs-comment-info'>
 <h2>Comment Type PHP/JS</h2>
@@ -1435,7 +1433,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div c
 <div id='loading-usedin' style='display: none;'><h2>Scanning Database<span class='loading-dots'>..</span></h2></div>
 <div id='note-usedin-found' style='display: none;'><small>You can edit the above areas where this code is used.</small></div>
 <div id='note-usedin-not' style='display: none;'><small>This code is not used in any area of the JCB custom code blocks at this time.</small></div>
-</div>"
+</div></div>"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL="Information Area."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL="Ordering"
@@ -1485,6 +1483,7 @@ COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENT_ADD="Add&nbsp;Help Document<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENTS="Joomla Components<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENT_ADD="Add&nbsp;Joomla Component<br /><br />"
+COM_COMPONENTBUILDER_DASHBOARD_LANGUAGE_TRANSLATIONS="Language Translations<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_LAYOUTS="Layouts<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_LAYOUT_ADD="Add&nbsp;Layout<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_SITE_VIEWS="Site Views<br /><br />"
@@ -2110,6 +2109,7 @@ COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ZERO="0"
 COM_COMPONENTBUILDER_FORCE_LOCAL_UPDATE="Force Local Update"
+COM_COMPONENTBUILDER_GET_THE_KEY_FROM_BSB_FOR_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from <b>%s</b> for <a class="btn btn-primary" href="%s" target="_blank" title="get a key from %s">%s</a>"
 COM_COMPONENTBUILDER_GLOBAL="Global"
 COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!"
 COM_COMPONENTBUILDER_HELP_DOCUMENT="Help Document"
@@ -2262,6 +2262,8 @@ COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDS="Select the file to import da
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES="Select the file to import data to fieldtypes."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS="Select the file to import data to help_documents."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS="Select the file to import data to joomla_components."
+COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES="Select the file to import data to languages."
+COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS="Select the file to import data to language_translations."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LAYOUTS="Select the file to import data to layouts."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SITE_VIEWS="Select the file to import data to site_views."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS="Select the file to import data to snippets."
@@ -2554,12 +2556,20 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXIT="Exit"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPAND="Expand"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPAND_TWO="Expand 2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPIRED="Expired"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK="Export Buy Link"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS="Joomla Component Export Components Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export components button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY="Export Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_DESCRIPTION="The key used to lock the data during export."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT="Export Key Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_LABEL="Export Key<br /><small>(encrypted field)</small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK="Export Package Link"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_DESCRIPTION="Enter link where you latest JCB package can be found"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_HINT="http://www.example.com/buy-package"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_LABEL="Package Link<br /><small>(to get updated package)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EYE_CLOSE="Eye Close"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EYE_OPEN="Eye Open"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FEATURED="Featured"
@@ -2626,6 +2636,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS="Joomla Co
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import components button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO="Info"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION="The settings below are used when you export this component as a JCB Package, for more info on how this works please review the following tutorial (<a href='https://youtu.be/lkE0ZiSWufg' target='_blank'>https://youtu.be/lkE0ZiSWufg</a>)."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL="JCB Package Export Settings"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_KEY="Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LAMP="Lamp"
@@ -2755,7 +2767,7 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo
 <br />
  If you want to support this project, please consider donating:<br />
  * PayPal: pay@vdm.io<br />
- * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3
+ * Bitcoin: 1Ga1WZyxC4ArSKuiFpUxdqzjfkAR1kJhZh
 </code></div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL="Demo README (with all place-holders)"
 COM_COMPONENTBUILDER_JOOMLA_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>"
@@ -2930,6 +2942,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_THUMBS_UP="Thumbs Up"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_DESCRIPTION="Enter contributor's title in relation to this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_HINT="Contributor's Role"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_LABEL="Job Title"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE="Tree"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UNARCHIVE="Unarchive"
@@ -2996,6 +3009,154 @@ COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS="- Keep Original Access -"
 COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -"
 COM_COMPONENTBUILDER_KEEP_ORIGINAL_STATE="- Keep Original State -"
 COM_COMPONENTBUILDER_KEY="Key"
+COM_COMPONENTBUILDER_LANGUAGE="Language"
+COM_COMPONENTBUILDER_LANGUAGES="Languages"
+COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
+COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC="Allows the users in this group to access access languages"
+COM_COMPONENTBUILDER_LANGUAGES_BATCH_OPTIONS="Batch process the selected Languages"
+COM_COMPONENTBUILDER_LANGUAGES_BATCH_TIP="All changes will be applied to all selected Languages"
+COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
+COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch languages"
+COM_COMPONENTBUILDER_LANGUAGES_CREATE="Languages Create"
+COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC="Allows the users in this group to create create languages"
+COM_COMPONENTBUILDER_LANGUAGES_DELETE="Languages Delete"
+COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC="Allows the users in this group to delete delete languages"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT="Languages Edit"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_DESC="Allows the users in this group to edit the language"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN="Languages Edit Own"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN_DESC="Allows the users in this group to edit edit own languages created by them"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE="Languages Edit State"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC="Allows the users in this group to update the state of the language"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION="Languages Edit Version"
+COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version languages"
+COM_COMPONENTBUILDER_LANGUAGES_EXPORT="Languages Export"
+COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC="Allows the users in this group to export export languages"
+COM_COMPONENTBUILDER_LANGUAGES_IMPORT="Languages Import"
+COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to import import languages"
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_ARCHIVED="%s Languages archived."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_ARCHIVED_1="%s Language archived."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_CHECKED_IN_0="No Language successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_CHECKED_IN_1="%d Language successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_CHECKED_IN_MORE="%d Languages successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_DELETED="%s Languages deleted."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_DELETED_1="%s Language deleted."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_FEATURED="%s Languages featured."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_FEATURED_1="%s Language featured."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_PUBLISHED="%s Languages published."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_PUBLISHED_1="%s Language published."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_TRASHED="%s Languages trashed."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_TRASHED_1="%s Language trashed."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNFEATURED="%s Languages unfeatured."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNFEATURED_1="%s Language unfeatured."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED="%s Languages unpublished."
+COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%s Language unpublished."
+COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
+COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to update the submenu of the language"
+COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC="The user that created this Language."
+COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_DESC="The date this Language was created."
+COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_LANGUAGE_DETAILS="Details"
+COM_COMPONENTBUILDER_LANGUAGE_EDIT="Editing the Language"
+COM_COMPONENTBUILDER_LANGUAGE_ERROR_UNIQUE_ALIAS="Another Language has the same alias."
+COM_COMPONENTBUILDER_LANGUAGE_ID="Id"
+COM_COMPONENTBUILDER_LANGUAGE_LANGTAG="Langtag"
+COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_DESCRIPTION="Enter the language tag – example: en-GB for English (UK). This should be the exact prefix used for the language installed or to be installed."
+COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_HINT="en-GB"
+COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_LABEL="Language Tag"
+COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_DESC="The last user that modified this Language."
+COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_DESC="The date this Language was modified."
+COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_LABEL="Modified Date"
+COM_COMPONENTBUILDER_LANGUAGE_NAME="Name"
+COM_COMPONENTBUILDER_LANGUAGE_NAME_DESCRIPTION="Enter Name Here"
+COM_COMPONENTBUILDER_LANGUAGE_NAME_HINT="Name Here"
+COM_COMPONENTBUILDER_LANGUAGE_NAME_LABEL="Name"
+COM_COMPONENTBUILDER_LANGUAGE_NEW="A New Language"
+COM_COMPONENTBUILDER_LANGUAGE_ORDERING_LABEL="Ordering"
+COM_COMPONENTBUILDER_LANGUAGE_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_LANGUAGE_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_LANGUAGE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Language to customise the alias."
+COM_COMPONENTBUILDER_LANGUAGE_STATUS="Status"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION="Language Translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS="Language Translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS="Language Translations Access"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access access language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_OPTIONS="Batch process the selected Language Translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_TIP="All changes will be applied to all selected Language Translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE="Language Translations Batch Use"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE="Language Translations Create"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST="Language Translations Dashboard List"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE="Language Translations Delete"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC="Allows the users in this group to delete delete language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT="Language Translations Edit"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_DESC="Allows the users in this group to edit the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN="Language Translations Edit Own"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own language translations created by them"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE="Language Translations Edit State"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION="Language Translations Edit Version"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT="Language Translations Export"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC="Allows the users in this group to export export language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT="Language Translations Import"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC="Allows the users in this group to import import language translations"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED="%s Language Translations archived."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED_1="%s Language Translation archived."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_0="No Language Translation successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_1="%d Language Translation successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_MORE="%d Language Translations successfully checked in."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_DELETED="%s Language Translations deleted."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_DELETED_1="%s Language Translation deleted."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_FEATURED="%s Language Translations featured."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_FEATURED_1="%s Language Translation featured."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_PUBLISHED="%s Language Translations published."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_PUBLISHED_1="%s Language Translation published."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_TRASHED="%s Language Translations trashed."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_TRASHED_1="%s Language Translation trashed."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNFEATURED="%s Language Translations unfeatured."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNFEATURED_1="%s Language Translation unfeatured."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED="%s Language Translations unpublished."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED_1="%s Language Translation unpublished."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU="Language Translations Submenu"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the language translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS="Components"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL="Components"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_DESC="The user that created this Language Translation."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_DESC="The date this Language Translation was created."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_DETAILS="Details"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_EDIT="Editing the Language Translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION="Entranslation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_HINT="Automatically generated!"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL="English String"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ERROR_UNIQUE_ALIAS="Another Language Translation has the same alias."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ID="Id"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE="Language"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE_LABEL="Language"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_DESC="The last user that modified this Language Translation."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_DESC="The date this Language Translation was modified."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_LABEL="Modified Date"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_NEW="A New Language Translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ORDERING_LABEL="Ordering"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Language Translation to customise the alias."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS="Status"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION="Translation"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translation strings."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String Here"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translated String"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_SELECT="add/edit"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised."
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC="A count of the number of times this Language has been revised."
+COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_LAYOUTS_ACCESS="Layouts Access"
@@ -3104,6 +3265,7 @@ COM_COMPONENTBUILDER_NEW="New"
 COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
+COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
 COM_COMPONENTBUILDER_OPENED_BY="opened by"
@@ -3672,6 +3834,8 @@ COM_COMPONENTBUILDER_SUBMENU_FIELDS="Fields"
 COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes"
 COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components"
+COM_COMPONENTBUILDER_SUBMENU_LANGUAGES="Languages"
+COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_TRANSLATIONS="Language Translations"
 COM_COMPONENTBUILDER_SUBMENU_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_SUBMENU_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_SUBMENU_SNIPPETS="Snippets"
@@ -3789,6 +3953,8 @@ COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading"
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the <b>JCB Global Options</b>, go to the <b>Company</b> tab and add the correct company details there."
+COM_COMPONENTBUILDER_TRANSLATION="Translation"
+COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
 COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_USE_KEY="Use Key"

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

@@ -10,6 +10,7 @@ COM_COMPONENTBUILDER_MENU_FIELDS="Fields"
 COM_COMPONENTBUILDER_MENU_FIELDTYPES="Fieldtypes"
 COM_COMPONENTBUILDER_MENU_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_MENU_JOOMLA_COMPONENTS="Joomla Components"
+COM_COMPONENTBUILDER_MENU_LANGUAGE_TRANSLATIONS="Language Translations"
 COM_COMPONENTBUILDER_MENU_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_MENU_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_MENU_SNIPPETS="Snippets"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@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.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
@@ -31,8 +31,8 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'php_controller',
-	'php_controller_list',
 	'php_model',
+	'php_controller_list',
 	'php_model_list'
 );
 

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@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.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@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.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vxwfields;
+$items	= $displayData->vxxfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vxxlinked_components;
+$items	= $displayData->vxylinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@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.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.10
-	@build			31st March, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php