Fixed gh-75 to insure the column names are loaded as before. Fix gh-76 by adding more checks to insure that the correct date is used in the getLastModifiedDate method.

Development of the export feature of JCB components mapping.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.3.6)
+# Component Builder (2.4.5)
 
 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.6) 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.5) 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.
 
@@ -70,16 +70,19 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 + You can dynamically add internal help structures to all component.
 + There is no limitations on how big or how much you want to build (server limitation only).
 + This is a complete factory kind of component that functions like a deployment hub.
++ Export any component completely mapped in JCB and import into another JCB.
 + This and much much more are all possible with this component builder!
 
 # 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)
 
@@ -104,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*: 1st March, 2017
-+ *Version*: 2.3.6
++ *Last Build*: 4th May, 2017
++ *Version*: 2.4.5
 + *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*: **92671**
-+ *File count*: **596**
-+ *Folder count*: **105**
++ *Line count*: **105986**
++ *File count*: **642**
++ *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)

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.3.6)
+# Component Builder (2.4.5)
 
 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.6) 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.5) 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.
 
@@ -70,16 +70,19 @@ Once installed upgrades are quick and easy via the default Joomla upgrade area.
 + You can dynamically add internal help structures to all component.
 + There is no limitations on how big or how much you want to build (server limitation only).
 + This is a complete factory kind of component that functions like a deployment hub.
++ Export any component completely mapped in JCB and import into another JCB.
 + This and much much more are all possible with this component builder!
 
 # 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)
 
@@ -104,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*: 1st March, 2017
-+ *Version*: 2.3.6
++ *Last Build*: 4th May, 2017
++ *Version*: 2.4.5
 + *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*: **92671**
-+ *File count*: **596**
-+ *Folder count*: **105**
++ *Line count*: **105986**
++ *File count*: **642**
++ *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)

admin/access.xml

@@ -101,6 +101,8 @@
 		<action name="help_document.export" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC" />
 		<action name="help_document.import" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC" />
 		<action name="help_document.submenu" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC" />
+		<action name="joomla_component.export_components" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS_DESC" />
+		<action name="joomla_component.import_components" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.access" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC" />
 		<action name="joomla_component.batch" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC" />
 		<action name="joomla_component.dashboard_add" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DASHBOARD_ADD_DESC" />
@@ -111,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" />
@@ -241,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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 99 of this MVC
-	@build			1st March, 2017
+	@version		@update number 110 of this MVC
+	@build			25th April, 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 99 of this MVC
-	@build			1st March, 2017
+	@version		@update number 110 of this MVC
+	@build			25th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/compiler.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 26 of this MVC
-	@build			28th February, 2017
+	@version		@update number 48 of this MVC
+	@build			26th April, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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/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 96 of this MVC
-	@build			17th February, 2017
+	@version		@update number 337 of this MVC
+	@build			26th April, 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 96 of this MVC
-	@build			17th February, 2017
+	@version		@update number 337 of this MVC
+	@build			26th April, 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

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

admin/assets/css/layouts.css

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

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			1st March, 2017
+	@version		@update number 51 of this MVC
+	@build			6th March, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			1st March, 2017
+	@version		@update number 51 of this MVC
+	@build			6th March, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.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

@@ -146,13 +146,18 @@ abstract class ###Component###Helper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@@ -691,6 +696,20 @@ abstract class ###Component###Helper
 		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
+			// create file name without the extention that is safe
+			if ($type === 'filename')
+			{
+				// make sure VDM is not in the string
+				$string = str_replace('VDM', 'vDm', $string);
+				// Remove anything which isn't a word, whitespace, number
+				// or any of the following caracters -_()
+				// 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);
+				// http://stackoverflow.com/a/2021729/1429677
+				return preg_replace('/\s+/', ' ', $string);
+			}
 			// remove all other characters
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);

admin/compiler/joomla_3/Helper_category.php

@@ -0,0 +1,35 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### Component Category Tree
+ */
+###CATEGORY_CLASS_TREES###

admin/compiler/joomla_3/Helper_category_view.php

@@ -0,0 +1,50 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### ###View### Component Category Tree
+ */
+class ###Component######Views###Categories extends JCategories
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__###component###_###view###';
+		$options['extension'] = 'com_###component###.###views###';
+
+		parent::__construct($options);
+	}
+}

admin/compiler/joomla_3/Helper_site.php

@@ -320,13 +320,18 @@ abstract class ###Component###Helper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@@ -683,6 +688,20 @@ abstract class ###Component###Helper
 		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
+			// create file name without the extention that is safe
+			if ($type === 'filename')
+			{
+				// make sure VDM is not in the string
+				$string = str_replace('VDM', 'vDm', $string);
+				// Remove anything which isn't a word, whitespace, number
+				// or any of the following caracters -_()
+				// 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);
+				// http://stackoverflow.com/a/2021729/1429677
+				return preg_replace('/\s+/', ' ', $string);
+			}
 			// remove all other characters
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -34,6 +34,11 @@ defined('_JEXEC') or die('Restricted access');
  */
 class ###Component###ModelImport extends JModelLegacy
 {
+	// set uploading values
+	protected $use_streams = false;
+	protected $allow_unsafe = false;
+	protected $safeFileOptions = array();
+	
 	/**
 	 * @var object JTable object
 	 */
@@ -75,10 +80,6 @@ class ###Component###ModelImport extends JModelLegacy
 		// Recall the 'Import from Directory' path.
 		$path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path'));
 		$this->setState('import.directory', $path);
-		// set uploading values
-		$this->use_streams = false;
-		$this->allow_unsafe = false;
-		$this->safeFileOptions = array();
 		parent::populateState();
 	}
 
@@ -285,21 +286,16 @@ class ###Component###ModelImport extends JModelLegacy
 		}
 		
 		// check the extention
-		switch(strtolower(pathinfo($p_dir, PATHINFO_EXTENSION))){
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			break;
-			
-			default:
+		if(!$this->checkExtension($p_dir))
+		{
+			// set error message
 			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
-			break;
 		}
 		
 		$package['packagename'] = null;
-		$package['dir'] 		= $p_dir;
-		$package['type'] 		= $type;
+		$package['dir'] 	= $p_dir;
+		$package['type'] 	= $type;
 
 		return $package;
 	}
@@ -357,21 +353,15 @@ class ###Component###ModelImport extends JModelLegacy
 		$archivename = JPath::clean($archivename);
 		
 		// check the extention
-		switch(strtolower(pathinfo($archivename, PATHINFO_EXTENSION))){
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			break;
-			
-			default:
+		if(!$this->checkExtension($archivename))
+		{
 			// Cleanup the import files
 			$this->remove($archivename);
 			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
-			break;
-		}	
+		}
 		
-		$config					= JFactory::getConfig();
+		$config			= JFactory::getConfig();
 		// set Package Name
 		$check['packagename']	= $archivename;
 		
@@ -384,6 +374,28 @@ class ###Component###ModelImport extends JModelLegacy
 		return $check;
 	}
 	
+	/**
+	 * Check the extension 
+	 *
+	 * @param   string  $file    Name of the uploaded file
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+	protected function checkExtension($file)
+	{		
+		// check the extention
+		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
+		{
+			case 'xls':
+			case 'ods':
+			case 'csv':
+			return true;
+			break;
+		}
+		return false;
+	}
+	
 	/**
 	 * Clean up temporary uploaded spreadsheet
 	 *

admin/compiler/joomla_3/JModelLegacy_import_custom.php

@@ -34,6 +34,11 @@ defined('_JEXEC') or die('Restricted access');
  */
 class ###Component###Model###View### extends JModelLegacy
 {
+	// set uploading values
+	protected $use_streams = false;
+	protected $allow_unsafe = false;
+	protected $safeFileOptions = array();
+	
 	/**
 	 * @var object JTable object
 	 */
@@ -75,10 +80,6 @@ class ###Component###Model###View### extends JModelLegacy
 		// Recall the 'Import from Directory' path.
 		$path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path'));
 		$this->setState('import.directory', $path);
-		// set uploading values
-		$this->use_streams = false;
-		$this->allow_unsafe = false;
-		$this->safeFileOptions = array();
 		parent::populateState();
 	}
 	###IMPORT_METHOD_CUSTOM### 
@@ -175,21 +176,16 @@ class ###Component###Model###View### extends JModelLegacy
 		}
 		
 		// check the extention
-		switch(strtolower(pathinfo($p_dir, PATHINFO_EXTENSION))){
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			break;
-			
-			default:
+		if(!$this->checkExtension($p_dir))
+		{
+			// set error message
 			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
-			break;
 		}
 		
 		$package['packagename'] = null;
-		$package['dir'] 		= $p_dir;
-		$package['type'] 		= $type;
+		$package['dir'] 	= $p_dir;
+		$package['type'] 	= $type;
 
 		return $package;
 	}
@@ -247,21 +243,15 @@ class ###Component###Model###View### extends JModelLegacy
 		$archivename = JPath::clean($archivename);
 		
 		// check the extention
-		switch(strtolower(pathinfo($archivename, PATHINFO_EXTENSION))){
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			break;
-			
-			default:
+		if(!$this->checkExtension($archivename))
+		{
 			// Cleanup the import files
 			$this->remove($archivename);
 			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
-			break;
-		}	
+		}
 		
-		$config					= JFactory::getConfig();
+		$config			= JFactory::getConfig();
 		// set Package Name
 		$check['packagename']	= $archivename;
 		
@@ -273,6 +263,7 @@ class ###Component###Model###View### extends JModelLegacy
 		
 		return $check;
 	}
+	###IMPORT_EXT_METHOD_CUSTOM### 
 	
 	/**
 	 * Clean up temporary uploaded spreadsheet

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/install.mysql.utf8.sql

@@ -1,6 +1,11 @@
 ###INSTALL###
 
 --
--- Always insure this column is large enough for all the access control values.
+-- Always insure this column rules is large enough for all the access control values.
 --
 ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';
+
+--
+-- Always insure this column name is large enough for long component and view names.
+--
+ALTER TABLE `#__assets` CHANGE `name` `name` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The unique name for the asset.';

admin/compiler/joomla_3/settings.json

@@ -157,24 +157,19 @@
             "rename": "Helper_site",
             "type": "file"
       },
+      "Helper_category.php": {
+            "naam":"Helper_category.php",
+            "path": "c0mp0n3nt/site/helpers",
+            "rename": "new",
+            "newName": "category.php",
+            "type": "file"
+      },
       "script.php": {
             "naam":"script.php",
             "path": "c0mp0n3nt/",
             "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",
@@ -212,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",
@@ -677,6 +660,11 @@
           "rename": "new",
           "newName": "submitbutton.js",
           "type": "custom_form"
+        },
+        "Helper_category_view.php": {
+          "path": "c0mp0n3nt/site/helpers",
+          "rename": "Helper_category_view",
+          "type": "category"
         }
       },
       "custom_admin": {

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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"
@@ -222,6 +235,116 @@
 			message="Error! Please add folder path here."
 			hint="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT"
 		/>
+	</fieldset>
+	<fieldset
+		name="company_custom_config"
+		label="COM_COMPONENTBUILDER_CONFIG_COMPANY">
+
+		<!-- Export_company Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="export_company"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="STRING"
+			message="Error! Please add company name here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_HINT"
+		/>		
+		<!-- Export_owner Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="export_owner"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_LABEL"
+			size="10"
+			maxlength="120"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="HTML"
+			message="Error! Please add owner name here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_HINT"
+		/>		
+		<!-- Export_email Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="export_email"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			validate="email"
+			message="Error! Please email address here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT"
+		/>		
+		<!-- Export_website Field. Type: Url. (joomla) -->
+		<field
+			type="url"
+			name="export_website"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="url"
+			validated="url"
+			message="Error! Please add website here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT"
+		/>		
+		<!-- Export_license Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="export_license"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL"
+			rows="7"
+			cols="10"
+			default="GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION"
+			class="text_area span12"
+			filter="HTML"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT"
+			required="true"
+		/>		
+		<!-- Export_copyright Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="export_copyright"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_LABEL"
+			rows="7"
+			cols="10"
+			default="Copyright (C) 2015. All Rights Reserved"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_DESCRIPTION"
+			class="text_area span12"
+			filter="HTML"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_HINT"
+			required="true"
+		/>		
+		<!-- Export_buy_link Field. Type: Url. (joomla) -->
+		<field
+			type="url"
+			name="export_buy_link"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION"
+			class="text_area"
+			required="false"
+			filter="url"
+			validated="url"
+			message="Error! Please add link here."
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT"
+		/>
 	</fieldset>
 	<fieldset
 		name="permissions"

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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 99 of this MVC
-	@build			1st March, 2017
+	@version		@update number 110 of this MVC
+	@build			25th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 99 of this MVC
-	@build			1st March, 2017
+	@version		@update number 110 of this MVC
+	@build			25th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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 26 of this MVC
-	@build			28th February, 2017
+	@version		@update number 48 of this MVC
+	@build			26th April, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -66,9 +66,9 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 		if($user->authorise('core.admin', 'com_componentbuilder'))
 		{
 			// get the post values
-			$jinput 			= JFactory::getApplication()->input;
+			$jinput 		= JFactory::getApplication()->input;
 			$componentId 		= $jinput->post->get('component', 0, 'INT');
-			$version			= $jinput->post->get('version', 0, 'INT');
+			$version		= $jinput->post->get('version', 0, 'INT');
 			$addBackup		= $jinput->post->get('backup', 0, 'INT');
 			$addGit			= $jinput->post->get('git', 0, 'INT');
 			$addPlaceholders	= $jinput->post->get('placeholders', 2, 'INT');
@@ -93,62 +93,37 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 			if (empty($redirect_url) && $componentId > 0)
 			{
 				$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
-				// setup the unrealistic numbers
-				$counter	= $model->getCount();
-				$folders	= $counter['folders'] * 5;
-				$files		= $counter['files'] * 5;
-				$lines		= $counter['lines'] * 10;
-				$seconds	= $folders + $files + $lines;
-				$totalHours	= round($seconds / 3600);
-				$totalDays	= round($totalHours / 8);
-				// setup the more realistic numbers
-				$debugging		= $seconds / 4;
-				$planning		= $seconds / 7;
-				$mapping		= $seconds / 10;
-				$office			= $seconds / 6;
-				$seconds		= $folders + $files + $lines + $debugging + $planning + $mapping + $office;
-				$actualTotalHours	= round($seconds / 3600);
-				$actualTotalDays	= round($actualTotalHours / 8);
-				$debuggingHours		= round($debugging / 3600);
-				$planningHours		= round($planning / 3600);
-				$mappingHours		= round($mapping / 3600);
-				$officeHours		= round($office / 3600);
-				// the actual time spent
-				$actualHoursSpent = $actualTotalHours - $totalHours;
-				$actualDaysSpent = $actualTotalDays - $totalDays;
-				// calculate the projects actual time frame of completion
-				$projectWeekTime = round($actualTotalDays / 5,1);
-				$projectMonthTime = round($actualTotalDays / 24,1);
-				if (($pos = strpos($counter['filePath'], "/tmp/")) !== FALSE)
+				if (($pos = strpos($model->compiler->filepath, "/tmp/")) !== FALSE)
 				{
-				    $url = JURI::root() . substr($counter['filePath'], $pos + 1);
+				    $url = JURI::root() . substr($model->compiler->filepath, $pos + 1);
 				}
 				// Message of successful build
-				$message = '<h1>The ('.$counter['filename'].') Was Successfully Compiled!</h1>';
+				$message = '<h1>The ('.$model->compiler->componentFolderName.') Was Successfully Compiled!</h1>';
 				$message .= '<p><button class="btn btn-small btn-success" onclick="Joomla.submitbutton(\'compiler.installExtention\')">';
-				$message .= 'Install '.$counter['filename'].' on this <span class="icon-joomla icon-white"></span>Joomla website.</button></p>';
+				$message .= 'Install '.$model->compiler->componentFolderName.' on this <span class="icon-joomla icon-white"></span>Joomla website.</button></p>';
 				$message .= '<h2>Total time saved</h2>';
 				$message .= '<ul>';
-				$message .= '<li>Total folders created: <b>'.$counter['folders'].'</b></li>';
-				$message .= '<li>Total files created: <b>'.$counter['files'].'</b></li>';
-				$message .= '<li>Total lines written: <b>'.$counter['lines'].'</b></li>';
+				$message .= '<li>Total folders created: <b>'.$model->compiler->folderCount.'</b></li>';
+				$message .= '<li>Total files created: <b>'.$model->compiler->fileCount.'</b></li>';
+				$message .= '<li>Total lines written: <b>'.$model->compiler->lineCount.'</b></li>';
+				$message .= '<li>A4 Book of: <b>'.$model->compiler->pageCount.' pages</b></li>';
 				$message .= '</ul>';
-				$message .= '<p><b>'.$totalHours.' Hours</b> or <b>'.$totalDays.' Eight Hour Days</b> <em>(actual time you saved)</em><br />';
+				$message .= '<p><b>'.$model->compiler->totalHours.' Hours</b> or <b>'.$model->compiler->totalDays.' Eight Hour Days</b> <em>(actual time you saved)</em><br />';
 				$message .= '<small>(if creating a folder and file took <b>5 seconds</b> and writing one line of code took <b>10 seconds</b>, never making one mistake or taking any coffee break.)</small><br />';
-				$message .= '<b>'.$actualHoursSpent.' Hours</b> or <b>'.$actualDaysSpent.' Eight Hour Days</b> <em>(the actual time you spent)</em><br />';
-				$message .= '<small>(with the following break down: <b>debugging @'.$debuggingHours.'hours</b> = codingtime / 4; <b>planning @'.$planningHours.'hours</b> = codingtime / 7; <b>mapping @'.$mappingHours.'hours</b> = codingtime / 10; <b>office @'.$officeHours.'hours</b> = codingtime / 6;)</small></p>';
-				$message .= '<p><b>'.$actualTotalHours.' Hours</b> or <b>'.$actualTotalDays.' Eight Hour Days</b> <em>(a total of the realistic time frame for this project)</em><br />';
+				$message .= '<b>'.$model->compiler->actualHoursSpent.' Hours</b> or <b>'.$model->compiler->actualDaysSpent.' Eight Hour Days</b> <em>(the actual time you spent)</em><br />';
+				$message .= '<small>(with the following break down: <b>debugging @'.$model->compiler->debuggingHours.'hours</b> = codingtime / 4; <b>planning @'.$model->compiler->planningHours.'hours</b> = codingtime / 7; <b>mapping @'.$model->compiler->mappingHours.'hours</b> = codingtime / 10; <b>office @'.$model->compiler->officeHours.'hours</b> = codingtime / 6;)</small></p>';
+				$message .= '<p><b>'.$model->compiler->actualTotalHours.' Hours</b> or <b>'.$model->compiler->actualTotalDays.' Eight Hour Days</b> <em>(a total of the realistic time frame for this project)</em><br />';
 				$message .= '<small>(if creating a folder and file took <b>5 seconds</b> and writing one line of code took <b>10 seconds</b>, with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)</small></p>';
-				$message .= '<p>Project duration: <b>'.$projectWeekTime. ' weeks</b> or <b>'.$projectMonthTime.' months</b></p>';
+				$message .= '<p>Project duration: <b>'.$model->compiler->projectWeekTime. ' weeks</b> or <b>'.$model->compiler->projectMonthTime.' months</b></p>';
 				$message .= '<h2>Path to Zip File</h2>';
-				$message .= '<p><b>Path:</b> <code>'.$counter['filePath'].'</code><br />';
+				$message .= '<p><b>Path:</b> <code>'.$model->compiler->filepath.'</code><br />';
 				$message .= '<b>URL:</b> <code>'.$url.'</code><br /><br />';
 				$message .= '<small>Hey! you can also download the file right now!</small><br /><a class="btn btn-success" href="'.$url.'" ><span class="icon-download icon-white"></span>Download</a></p>';
 				$message .= '<p><small><b>Remember!</b> This file is in your tmp folder and therefore publicly accessible untill you click [Clear tmp]!</small> </p>';
-				$message .= '<p><small>Compilation took <b>'.$counter['time'].'</b> seconds to complete.</small> </p>';
+				$message .= '<p><small>Compilation took <b>'.$model->compiler->secondsCompiled.'</b> seconds to complete.</small> </p>';
 				// set redirect
 				$this->setRedirect($redirect_url,$message,'message');
-				$app->setUserState('com_componentbuilder.extension_name', $counter['filename']);
+				$app->setUserState('com_componentbuilder.extension_name', $model->compiler->componentFolderName);
 			} 
 			else
 			{

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/import_joomla_components.php

@@ -0,0 +1,67 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.4.5
+	@build			4th May, 2017
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		import_joomla_components.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');
+
+/**
+ * Componentbuilder Import_joomla_components Controller
+ */
+class ComponentbuilderControllerImport_joomla_components extends JControllerLegacy
+{
+	/**
+	 * Import an spreadsheet.
+	 *
+	 * @return  void
+	 */
+	public function import()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Import_joomla_components');
+		if ($model->import())
+		{
+			$cache = JFactory::getCache('mod_menu');
+			$cache->clean();
+			// TODO: Reset the users acl here as well to kill off any missing bits
+		}
+
+		$app = JFactory::getApplication();
+		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=import_joomla_components', false);
+		}
+		else
+		{
+			// wipe out the user state when we're going to redirect
+			$app->setUserState('com_componentbuilder.redirect_url', '');
+			$app->setUserState('com_componentbuilder.message', '');
+			$app->setUserState('com_componentbuilder.extension_message', '');
+		}
+		$this->setRedirect($redirect_url);
+	}
+}

admin/controllers/joomla_component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 96 of this MVC
-	@build			17th February, 2017
+	@version		@update number 337 of this MVC
+	@build			26th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php

admin/controllers/joomla_components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 96 of this MVC
-	@build			17th February, 2017
+	@version		@update number 337 of this MVC
+	@build			26th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php
@@ -99,7 +99,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 				$session->set('dataType_VDM_IMPORTINTO', 'joomla_component');
 				// Redirect to import view.
 				$message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS');
-				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message);
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import_joomla_components', false), $message);
 				return;
 			}
 		}
@@ -107,5 +107,136 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		$message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
 		return;
+	}  
+
+	public function smartImport()
+	{
+		// 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('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		{
+			$session = JFactory::getSession();
+			$session->set('backto_VDM_IMPORT', 'joomla_components');
+			$session->set('dataType_VDM_IMPORTINTO', 'smart_package');
+			// Redirect to import view.
+			$message = JText::_('COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL');
+			$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', false), $message);
+			return;
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
+		return;
 	}  
+
+        public function smartExport()
+	{
+		// 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('joomla_component.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);
+			// check if there is any selections
+			if (!ComponentbuilderHelper::checkArray($pks))
+			{
+				// Redirect to the list screen with error.
+				$message = JText::_('COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN');
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
+				return;
+			}
+			// Get the model
+			$model = $this->getModel('Joomla_components');
+			// set auto loader
+			ComponentbuilderHelper::autoLoader('smart');
+			// get the data to export
+			if ($model->getSmartExport($pks))
+			{
+				// set the key string
+				if (componentbuilderHelper::checkString($model->key) && strlen($model->key) == 32)
+				{
+					$keyNotice = '<h1>' . JText::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE', $model->key) . '</h1>';
+					$keyNotice .= '<p>' . JText::_('COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEYBR_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY') . '</h1>';
+					// set the package owner info
+					if ((isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company'])) || (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner'])))
+					{
+						$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '</h2>';
+						$ownerDetails .= '<ul>';
+						if (isset($model->info['getKeyFrom']['company']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['company']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $model->info['getKeyFrom']['company']) . '</li>';
+						}
+						// add value only if set
+						if (isset($model->info['getKeyFrom']['owner']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['owner']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $model->info['getKeyFrom']['owner']) . '</li>';
+						}
+						// add value only if set
+						if (isset($model->info['getKeyFrom']['website']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['website']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $model->info['getKeyFrom']['website']) . '</li>';
+						}
+						// add value only if set
+						if (isset($model->info['getKeyFrom']['email']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['email']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $model->info['getKeyFrom']['email']) . '</li>';
+						}
+						// add value only if set
+						if (isset($model->info['getKeyFrom']['license']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['license']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $model->info['getKeyFrom']['license']) . '</li>';
+						}
+						// add value only if set
+						if (isset($model->info['getKeyFrom']['copyright']) && componentbuilderHelper::checkString($model->info['getKeyFrom']['copyright']))
+						{
+							$ownerDetails .= '<li>' . JText::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $model->info['getKeyFrom']['copyright']) . '</li>';
+						}							
+						$ownerDetails .= '</ul>';
+					}
+					else
+					{
+						$ownerDetails = '<h2>' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET') . '</h2>';
+						$ownerDetails .= '<p>' . JText::_('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') . '</p>';
+						$ownerDetails .= '<h3>' . JText::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS') . '</h3>';
+						$ownerDetails .= '<p>' . JText::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB') . '</p>';
+					}
+				}
+				else
+				{
+					$keyNotice = '<h1>' . JText::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY') . '</h1>';
+					$ownerDetails = '<p>' . JText::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB') . '</p>';
+				}
+				// Redirect to the list screen with success.
+				$message = array();
+				$message[] = '<h1>' . JText::_('COM_COMPONENTBUILDER_EXPORT_COMPLETED') . '</h1>';
+				$message[] = '<p>' . JText::sprintf('COM_COMPONENTBUILDER_PATH_TO_THE_ZIPPED_PACKAGE_IS_CODESCODE_BR_S_S', $model->zipPath, $keyNotice, $ownerDetails) . '</p>';
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), implode('', $message), 'Success');
+				return;
+			}
+			else
+			{
+				if (componentbuilderHelper::checkString($model->packagePath))
+				{
+					// clear all if not successful
+					ComponentbuilderHelper::removeFolder($model->packagePath);
+				}
+				if (componentbuilderHelper::checkString($model->zipPath))
+				{
+					// clear all if not successful
+					JFile::delete($model->zipPath);
+				}				
+			}
+		}
+		// Redirect to the list screen with error.
+		$message = JText::_('COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER');
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
+		return;
+	}
 }

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

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

admin/controllers/layouts.php

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

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			1st March, 2017
+	@version		@update number 51 of this MVC
+	@build			6th March, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			1st March, 2017
+	@version		@update number 51 of this MVC
+	@build			6th March, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.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);
@@ -107,6 +107,8 @@ class Compiler extends Infusion
 			$this->setLangFileData();
 			// move the update server into place
 			$this->setUpdateServer();
+			// set the global counters
+			$this->setCountingStuff();
 			// build read me
 			$this->buildReadMe();
 			// zip the component
@@ -134,7 +136,7 @@ class Compiler extends Infusion
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Compiler '.$nr.']';	
 		}
@@ -150,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);
@@ -209,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);
@@ -302,6 +296,38 @@ class Compiler extends Infusion
 		$this->fileContentStatic['###BUILDDATE###'] = $this->fileContentStatic['###BUILDDATE###GLOBAL'];
 		$this->fileContentStatic['###VERSION###'] = $this->fileContentStatic['###VERSION###GLOBAL'];
 	}
+
+	// set all global numbers
+	protected function setCountingStuff()
+	{
+		// what is the size in terms of an A4 book
+		$this->pageCount		= round($this->lineCount / 56);
+		// setup the unrealistic numbers
+		$this->folderSeconds		= $this->folderCount * 5;
+		$this->fileSeconds		= $this->fileCount * 5;
+		$this->lineSeconds		= $this->lineCount * 10;
+		$this->seconds			= $this->folderSeconds + $this->fileSeconds + $this->lineSeconds;
+		$this->totalHours		= round($this->seconds / 3600);
+		$this->totalDays		= round($this->totalHours / 8);
+		// setup the more realistic numbers
+		$this->secondsDebugging		= $this->seconds / 4;
+		$this->secondsPlanning		= $this->seconds / 7;
+		$this->secondsMapping		= $this->seconds / 10;
+		$this->secondsOffice		= $this->seconds / 6;
+		$this->actualSeconds		= $this->folderSeconds + $this->fileSeconds + $this->lineSeconds + $this->secondsDebugging + $this->secondsPlanning + $this->secondsMapping + $this->secondsOffice;
+		$this->actualTotalHours		= round($this->actualSeconds / 3600);
+		$this->actualTotalDays		= round($this->actualTotalHours / 8);
+		$this->debuggingHours		= round($this->secondsDebugging / 3600);
+		$this->planningHours		= round($this->secondsPlanning / 3600);
+		$this->mappingHours		= round($this->secondsMapping / 3600);
+		$this->officeHours		= round($this->secondsOffice / 3600);
+		// the actual time spent
+		$this->actualHoursSpent		= $this->actualTotalHours - $this->totalHours;
+		$this->actualDaysSpent		= $this->actualTotalDays - $this->totalDays;
+		// calculate the projects actual time frame of completion
+		$this->projectWeekTime		= round($this->actualTotalDays / 5,1);
+		$this->projectMonthTime		= round($this->actualTotalDays / 24,1);		
+	}
 	
 	private function buildReadMe()
 	{
@@ -330,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
@@ -339,55 +365,39 @@ class Compiler extends Infusion
 	
 	private function buildReadMeData()
 	{
-		// setup the unrealistic numbers
-		$folders	= $this->folderCount * 5;
-		$files		= $this->fileCount * 5;
-		$lines		= $this->lineCount * 10;
-		$seconds	= $folders + $files + $lines;
-		$totalHours	= round($seconds / 3600);
-		$totalDays	= round($totalHours / 8);
-		// setup the more realistic numbers
-		$debugging		= $seconds / 4;
-		$planning		= $seconds / 7;
-		$mapping		= $seconds / 10;
-		$office			= $seconds / 6;
-		$seconds		= $folders + $files + $lines + $debugging + $planning + $mapping + $office;
-		$actualTotalHours	= round($seconds / 3600);
-		$actualTotalDays	= round($actualTotalHours / 8);
-		$debuggingHours		= round($debugging / 3600);
-		$planningHours		= round($planning / 3600);
-		$mappingHours		= round($mapping / 3600);
-		$officeHours		= round($office / 3600);
-		// the actual time spent
-		$actualHoursSpent = $actualTotalHours - $totalHours;
-		$actualDaysSpent = $actualTotalDays - $totalDays;
-		// calculate the projects actual time frame of completion
-		$projectWeekTime = round($actualTotalDays / 5,1);
-		$projectMonthTime = round($actualTotalDays / 24,1);
 		// set some defaults
-		$this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount;
-		$this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount;
-		$this->fileContentStatic['###FOLDER_COUNT###'] = $this->folderCount;
-		$this->fileContentStatic['###folders###'] = $folders;
-		$this->fileContentStatic['###files###'] = $files;
-		$this->fileContentStatic['###lines###'] = $lines;
-		$this->fileContentStatic['###seconds###'] = $seconds;
-		$this->fileContentStatic['###totalHours###'] = $totalHours;
-		$this->fileContentStatic['###totalDays###'] = $totalDays;
-		$this->fileContentStatic['###debugging###'] = $debugging;
-		$this->fileContentStatic['###planning###'] = $planning;
-		$this->fileContentStatic['###mapping###'] = $mapping;
-		$this->fileContentStatic['###office###'] = $office;
-		$this->fileContentStatic['###actualTotalHours###'] = $actualTotalHours;
-		$this->fileContentStatic['###actualTotalDays###'] = $actualTotalDays;
-		$this->fileContentStatic['###debuggingHours###'] = $debuggingHours;
-		$this->fileContentStatic['###planningHours###'] = $planningHours;
-		$this->fileContentStatic['###mappingHours###'] = $mappingHours;
-		$this->fileContentStatic['###officeHours###'] = $officeHours;
-		$this->fileContentStatic['###actualHoursSpent###'] = $actualHoursSpent;
-		$this->fileContentStatic['###actualDaysSpent###'] = $actualDaysSpent;
-		$this->fileContentStatic['###projectWeekTime###'] = $projectWeekTime;
-		$this->fileContentStatic['###projectMonthTime###'] = $projectMonthTime;
+		$this->fileContentStatic['###LINE_COUNT###']		= $this->lineCount;
+		$this->fileContentStatic['###FILE_COUNT###']		= $this->fileCount;
+		$this->fileContentStatic['###FOLDER_COUNT###']		= $this->folderCount;
+		$this->fileContentStatic['###PAGE_COUNT###']		= $this->pageCount;
+		$this->fileContentStatic['###folders###']		= $this->folderSeconds;
+		$this->fileContentStatic['###foldersSeconds###']	= $this->folderSeconds;
+		$this->fileContentStatic['###files###']			= $this->fileSeconds;
+		$this->fileContentStatic['###filesSeconds###']		= $this->fileSeconds;
+		$this->fileContentStatic['###lines###']			= $this->lineSeconds;
+		$this->fileContentStatic['###linesSeconds###']		= $this->lineSeconds;
+		$this->fileContentStatic['###seconds###']		= $this->actualSeconds;
+		$this->fileContentStatic['###actualSeconds###']		= $this->actualSeconds;
+		$this->fileContentStatic['###totalHours###']		= $this->totalHours;
+		$this->fileContentStatic['###totalDays###']		= $this->totalDays;
+		$this->fileContentStatic['###debugging###']		= $this->secondsDebugging;
+		$this->fileContentStatic['###secondsDebugging###']	= $this->secondsDebugging;
+		$this->fileContentStatic['###planning###']		= $this->secondsPlanning;
+		$this->fileContentStatic['###secondsPlanning###']	= $this->secondsPlanning;
+		$this->fileContentStatic['###mapping###']		= $this->secondsMapping;
+		$this->fileContentStatic['###secondsMapping###']	= $this->secondsMapping;
+		$this->fileContentStatic['###office###']		= $this->secondsOffice;
+		$this->fileContentStatic['###secondsOffice###']		= $this->secondsOffice;
+		$this->fileContentStatic['###actualTotalHours###']	= $this->actualTotalHours;
+		$this->fileContentStatic['###actualTotalDays###']	= $this->actualTotalDays;
+		$this->fileContentStatic['###debuggingHours###']	= $this->debuggingHours;
+		$this->fileContentStatic['###planningHours###']		= $this->planningHours;
+		$this->fileContentStatic['###mappingHours###']		= $this->mappingHours;
+		$this->fileContentStatic['###officeHours###']		= $this->officeHours;
+		$this->fileContentStatic['###actualHoursSpent###']	= $this->actualHoursSpent;
+		$this->fileContentStatic['###actualDaysSpent###']	= $this->actualDaysSpent;
+		$this->fileContentStatic['###projectWeekTime###']	= $this->projectWeekTime;
+		$this->fileContentStatic['###projectMonthTime###']	= $this->projectMonthTime;
 	}
 
 	private function zipComponent()
@@ -404,39 +414,9 @@ class Compiler extends Infusion
 		}
 		// the name of the zip file to create
 		$this->filepath = $this->tempPath.'/'.$this->componentFolderName.'.zip';
-		// store the current joomla working directory
-		$joomla = getcwd();
-
-		// we are changing the working directory to the componet temp folder
-		chdir($this->componentPath);
-
-		// the full file path of the zip file
-		$this->filepath = JPath::clean($this->filepath);
-
-		// delete an existing zip file (or use an exclusion parameter in JFolder::files()
-		JFile::delete($this->filepath);
-
-		// get a list of files in the current directory tree
-		$files = JFolder::files('.', '', true, true);
-		$zipArray = array();
-		// setup the zip array
-		foreach ($files as $file)
-		{
-		   $tmp = array();
-		   $tmp['name'] = str_replace('./', '', $file);
-		   $tmp['data'] = JFile::read($file);
-		   $tmp['time'] = filemtime($file);
-		   $zipArray[] = $tmp;
-		}
-
-		// change back to joomla working directory
-		chdir($joomla);
-
-		// get the zip adapter
-		$zip = JArchive::getAdapter('zip');
-
+		
 		//create the zip file
-		if ($zip->create($this->filepath, $zipArray))
+		if (ComponentbuilderHelper::zip($this->componentPath, $this->filepath))
 		{
 			// now move to backup if zip was made and backup is requered
 			if ($this->backupPath && $this->dynamicIntegration)

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
 	 * 
@@ -460,7 +495,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 +503,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 +518,9 @@ class Get
 				}
 				// get the component data
 				$this->componentData = $this->getComponentData();
-
+				// set the percentage when a language can be added
+				$this->percentageLanguageAdd = (int) $this->params->get('percentagelanguageadd', 50);
+				
 				return true;
 			}
 		}
@@ -500,7 +537,7 @@ class Get
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Get '.$nr.']';	
 		}
@@ -529,6 +566,14 @@ class Get
 
 		// Load the results as a list of stdClass objects
 		$component = $this->db->loadObject();
+		
+		// set component place holders
+		$this->placeholders['###component###'] = ComponentbuilderHelper::safeString($component->name_code);
+		$this->placeholders['###Component###'] = ComponentbuilderHelper::safeString($component->name_code, 'F');
+		$this->placeholders['###COMPONENT###'] = ComponentbuilderHelper::safeString($component->name_code, 'U');
+		$this->placeholders['[[[component]]]'] = $this->placeholders['###component###'];
+		$this->placeholders['[[[Component]]]'] = $this->placeholders['###Component###'];
+		$this->placeholders['[[[COMPONENT]]]'] = $this->placeholders['###COMPONENT###'];
 		// set component sales name
 		$component->sales_name = ComponentbuilderHelper::safeString($component->system_name);
 		// ensure version naming is correct
@@ -669,7 +714,7 @@ class Get
 		}
 
 		// set the site_view data
-		$site_views	= json_decode($component->addsite_views,true);
+		$site_views = json_decode($component->addsite_views,true);
 		if (ComponentbuilderHelper::checkArray($site_views))
 		{
 			foreach ($site_views as $option => $values)
@@ -690,11 +735,14 @@ class Get
 			$this->lang = 'site';
 			$this->target = 'site';
 			// load the view and field data
-			foreach ($component->site_views as $key => &$view)
+			if (isset($component->site_views) && ComponentbuilderHelper::checkArray($component->site_views))
 			{
-				// has become a lacacy issue, can't remove this
-				$view['view'] = $view['siteview'];
-				$view['settings'] = $this->getCustomViewData($view['view']);
+				foreach ($component->site_views as $key => &$view)
+				{
+					// has become a lacacy issue, can't remove this
+					$view['view'] = $view['siteview'];
+					$view['settings'] = $this->getCustomViewData($view['view']);
+				}
 			}
 		}
 
@@ -720,11 +768,14 @@ class Get
 			$this->lang = 'admin';
 			$this->target = 'custom_admin';
 			// load the view and field data
-			foreach ($component->custom_admin_views as $key => &$view)
+			if (isset($component->custom_admin_views) && ComponentbuilderHelper::checkArray($component->custom_admin_views))
 			{
-				// has become a lacacy issue, can't remove this
-				$view['view'] = $view['customadminview'];
-				$view['settings'] = $this->getCustomViewData($view['view'], 'custom_admin_view');
+				foreach ($component->custom_admin_views as $key => &$view)
+				{
+					// has become a lacacy issue, can't remove this
+					$view['view'] = $view['customadminview'];
+					$view['settings'] = $this->getCustomViewData($view['view'], 'custom_admin_view');
+				}
 			}
 		}
 
@@ -800,7 +851,7 @@ class Get
 		{			
 			foreach ($addScriptTypes as $scriptType)
 			{
-				if (isset($component->{'add_'.$scriptMethod.'_'.$scriptType}) && $component->{'add_'.$scriptMethod.'_'.$scriptType} == 1)
+				if (isset($component->{'add_'.$scriptMethod.'_'.$scriptType}) && $component->{'add_'.$scriptMethod.'_'.$scriptType} == 1 && ComponentbuilderHelper::checkString($component->{$scriptMethod.'_'.$scriptType}))
 				{
 					$this->customScriptBuilder[$scriptMethod][$scriptType] = $this->setDynamicValues(base64_decode($component->{$scriptMethod.'_'.$scriptType}));
 				}
@@ -812,7 +863,7 @@ class Get
 			}
 		}
 		// add_php_helper
-		if ($component->add_php_helper_admin == 1)
+		if ($component->add_php_helper_admin == 1 && ComponentbuilderHelper::checkString($component->php_helper_admin))
 		{
 			$this->lang = 'admin';
 			$this->customScriptBuilder['component_php_helper_admin'] = PHP_EOL.PHP_EOL.$this->setDynamicValues(base64_decode($component->php_helper_admin));
@@ -823,7 +874,7 @@ class Get
 		}
 		unset($component->php_helper);
 		// add_admin_event
-		if ($component->add_admin_event == 1)
+		if ($component->add_admin_event == 1 && ComponentbuilderHelper::checkString($component->php_admin_event))
 		{
 			$this->lang = 'admin';
 			$this->customScriptBuilder['component_php_admin_event'] = $this->setDynamicValues(base64_decode($component->php_admin_event));
@@ -834,7 +885,7 @@ class Get
 		}
 		unset($component->php_admin_event);
 		// add_php_helper_both
-		if ($component->add_php_helper_both == 1)
+		if ($component->add_php_helper_both == 1 && ComponentbuilderHelper::checkString($component->php_helper_both))
 		{
 			$this->lang = 'both';
 			$this->customScriptBuilder['component_php_helper_both'] = PHP_EOL.PHP_EOL.$this->setDynamicValues(base64_decode($component->php_helper_both));
@@ -844,7 +895,7 @@ class Get
 			$this->customScriptBuilder['component_php_helper_both'] = '';
 		}
 		// add_php_helper_site
-		if ($component->add_php_helper_site == 1)
+		if ($component->add_php_helper_site == 1 && ComponentbuilderHelper::checkString($component->php_helper_site))
 		{
 			$this->lang = 'site';
 			$this->customScriptBuilder['component_php_helper_site'] = PHP_EOL.PHP_EOL.$this->setDynamicValues(base64_decode($component->php_helper_site));
@@ -855,7 +906,7 @@ class Get
 		}
 		unset($component->php_helper);
 		// add_site_event
-		if ($component->add_site_event == 1)
+		if ($component->add_site_event == 1 && ComponentbuilderHelper::checkString($component->php_site_event))
 		{
 			$this->lang = 'site';
 			$this->customScriptBuilder['component_php_site_event'] = $this->setDynamicValues(base64_decode($component->php_site_event));
@@ -892,7 +943,7 @@ class Get
 		}
 		
 		// dashboard methods
-		if ($component->add_php_dashboard_methods)
+		if ($component->add_php_dashboard_methods && ComponentbuilderHelper::checkString($component->php_dashboard_methods))
 		{
 			$nowLang = $this->lang;
 			$this->lang = 'admin';
@@ -1216,7 +1267,7 @@ class Get
 			$addArrayJ = array('javascript_view_file','javascript_view_footer','javascript_views_file','javascript_views_footer');
 			foreach ($addArrayJ as $scripter)
 			{
-				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
+				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1 && ComponentbuilderHelper::checkString($view->$scripter))
 				{
 					$view->$scripter = $this->setDynamicValues(base64_decode($view->$scripter));
 					$scripter_target = str_replace('javascript_', '', $scripter);
@@ -1302,7 +1353,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import_display','php_import','php_import_setdata','php_import_save','html_import_view');
+				$addImportArray = array('php_import_ext','php_import_display','php_import','php_import_setdata','php_import_save','html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
@@ -1310,6 +1361,11 @@ class Get
 						$this->customScriptBuilder[$importScripter]['import_'.$name_list] = $this->setDynamicValues(base64_decode($view->$importScripter));
 						unset($view->$importScripter);
 					}
+					else
+					{
+						// load the default
+						$this->customScriptBuilder[$importScripter]['import_'.$name_list] = ComponentbuilderHelper::getImportScripts($importScripter, true);
+					}
 				}
 			}
 			
@@ -1458,7 +1514,7 @@ class Get
 		$addArray = array('php_view','php_jview','php_jview_display','php_document','js_document','css_document','css');
 		foreach ($addArray as $scripter)
 		{
-			if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
+			if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1 && ComponentbuilderHelper::checkString($view->$scripter))
 			{
 				$view->$scripter = $this->setDynamicValues(base64_decode($view->$scripter));
 				// set uikit to views
@@ -1647,7 +1703,7 @@ class Get
 			if (ComponentbuilderHelper::checkString($name_single) && !isset($this->customFieldScript[$name_single][$id]))
 			{
 				// add_javascript_view_footer
-				if ($this->_fieldData[$id]->add_javascript_view_footer == 1)
+				if ($this->_fieldData[$id]->add_javascript_view_footer == 1 && ComponentbuilderHelper::checkString($this->_fieldData[$id]->javascript_view_footer))
 				{
 					if(!isset($this->customScriptBuilder['view_footer']))
 					{
@@ -1705,7 +1761,7 @@ class Get
 			if (ComponentbuilderHelper::checkString($name_list) && !isset($this->customFieldScript[$name_list][$id]))
 			{
 				// add_javascript_views_footer
-				if ($this->_fieldData[$id]->add_javascript_views_footer == 1)
+				if ($this->_fieldData[$id]->add_javascript_views_footer == 1 && ComponentbuilderHelper::checkString($this->_fieldData[$id]->javascript_views_footer))
 				{
 					if(!isset($this->customScriptBuilder['views_footer']))
 					{
@@ -1798,12 +1854,12 @@ class Get
 					foreach ($results as $nr => &$result)
 					{
 						// add calculations if set
-						if($result->addcalculation == 1)
+						if($result->addcalculation == 1 && ComponentbuilderHelper::checkString($result->php_calculation))
 						{
-							$result->php_calculation = base64_decode($result->php_calculation);
+							$result->php_calculation = $this->setDynamicValues(base64_decode($result->php_calculation));
 						}
 						// add php custom scripting (php_before_getitem)
-						if($result->add_php_before_getitem == 1)
+						if($result->add_php_before_getitem == 1 && ComponentbuilderHelper::checkString($result->php_before_getitem))
 						{
 							if (!isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view_code]))
 							{
@@ -1814,7 +1870,7 @@ class Get
 							unset($result->php_before_getitem);
 						}
 						// add php custom scripting (php_after_getitem)
-						if($result->add_php_after_getitem == 1)
+						if($result->add_php_after_getitem == 1 && ComponentbuilderHelper::checkString($result->php_after_getitem))
 						{
 							if (!isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view_code]))
 							{
@@ -1825,7 +1881,7 @@ class Get
 							unset($result->php_after_getitem);
 						}
 						// add php custom scripting (php_before_getitems)
-						if($result->add_php_before_getitems == 1)
+						if($result->add_php_before_getitems == 1 && ComponentbuilderHelper::checkString($result->php_before_getitems))
 						{
 							if (!isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view_code]))
 							{
@@ -1836,7 +1892,7 @@ class Get
 							unset($result->php_before_getitems);
 						}
 						// add php custom scripting (php_after_getitems)
-						if($result->add_php_after_getitems == 1)
+						if($result->add_php_after_getitems == 1 && ComponentbuilderHelper::checkString($result->php_after_getitems))
 						{
 							if (!isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view_code]))
 							{
@@ -1847,7 +1903,7 @@ class Get
 							unset($result->php_after_getitems);
 						}
 						// add php custom scripting (php_getlistquery)
-						if($result->add_php_getlistquery == 1)
+						if($result->add_php_getlistquery == 1 && ComponentbuilderHelper::checkString($result->php_getlistquery))
 						{
 							if (!isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view_code]))
 							{
@@ -2213,7 +2269,7 @@ class Get
 			if ($k_ey == $n_ame || $key == $name)
 			{
 				$php_view = '';
-				if ($row->add_php_view == 1)
+				if ($row->add_php_view == 1 && ComponentbuilderHelper::checkString($row->php_view))
 				{
 					$php_view = $this->setDynamicValues(base64_decode($row->php_view));
 				}
@@ -2304,7 +2360,11 @@ class Get
 					$langHolders["JText::sprintf('".$string."',"] = "JText::sprintf('".$keyLang."',";
 					$langHolders['JText::sprintf("'.$string.'",'] = 'JText::sprintf("'.$keyLang.'",';
 				}
-				$content = $this->setPlaceholders($content, $langHolders);
+				// only continue if we have value to replace
+				if (isset($langHolders) && ComponentbuilderHelper::checkArray($langHolders))
+				{
+					$content = $this->setPlaceholders($content, $langHolders);
+				}
 			}
 		}
 		return $content;
@@ -2719,7 +2779,11 @@ class Get
 	 */
 	public function setDynamicValues($string)
 	{
-		return $this->setLangStrings($this->setCustomCodeData($string));
+		if (ComponentbuilderHelper::checkString($string))
+		{
+			return $this->setLangStrings($this->setCustomCodeData($string));
+		}
+		return $string;
 	}
 	
 	/**
@@ -2883,7 +2947,7 @@ class Get
 		}
 		else
 		{
-			if (!$keyPlaceholder = array_search($item['id'], $this->functionNameMemory))
+			if (($keyPlaceholder = array_search($item['id'], $this->functionNameMemory)) === false)
 			{
 				$keyPlaceholder = $item['id'];
 			}
@@ -2952,6 +3016,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

@@ -45,6 +45,13 @@ class Structure extends Get
 	 */
 	public $fileCount = 0;
 	
+	/**
+	 * The page counter
+	 * 
+	 * @var     int
+	 */
+	public $pageCount = 0;
+	
 	/**
 	 * The line counter
 	 * 
@@ -52,6 +59,153 @@ class Structure extends Get
 	 */
 	public $lineCount = 0;
 	
+	/**
+	 * The seconds counter
+	 * 
+	 * @var     int
+	 */
+	public $seconds = 0;
+	
+	/**
+	 * The actual seconds counter
+	 * 
+	 * @var     int
+	 */
+	public $actualSeconds = 0;
+	
+	/**
+	 * The folder seconds counter
+	 * 
+	 * @var     int
+	 */
+	public $folderSeconds = 0;
+	
+	/**
+	 * The file seconds counter
+	 * 
+	 * @var     int
+	 */
+	public $fileSeconds = 0;
+	
+	/**
+	 * The line seconds counter
+	 * 
+	 * @var     int
+	 */
+	public $lineSeconds = 0;
+	
+	/**
+	 * The seconds debugging counter
+	 * 
+	 * @var     int
+	 */
+	public $secondsDebugging = 0;
+	
+	/**
+	 * The seconds planning counter
+	 * 
+	 * @var     int
+	 */
+	public $secondsPlanning = 0;
+	
+	/**
+	 * The seconds mapping counter
+	 * 
+	 * @var     int
+	 */
+	public $secondsMapping = 0;
+	
+	/**
+	 * The seconds office counter
+	 * 
+	 * @var     int
+	 */
+	public $secondsOffice = 0;
+	
+	/**
+	 * The total hours counter
+	 * 
+	 * @var     int
+	 */
+	public $totalHours = 0;
+	
+	/**
+	 * The debugging hours counter
+	 * 
+	 * @var     int
+	 */
+	public $debuggingHours = 0;
+	
+	/**
+	 * The planning hours counter
+	 * 
+	 * @var     int
+	 */
+	public $planningHours = 0;
+	
+	/**
+	 * The mapping hours counter
+	 * 
+	 * @var     int
+	 */
+	public $mappingHours = 0;
+	
+	/**
+	 * The office hours counter
+	 * 
+	 * @var     int
+	 */
+	public $officeHours = 0;
+	
+	/**
+	 * The actual Total Hours counter
+	 * 
+	 * @var     int
+	 */
+	public $actualTotalHours = 0;
+	
+	/**
+	 * The actual hours spent counter
+	 * 
+	 * @var     int
+	 */
+	public $actualHoursSpent = 0;
+	
+	/**
+	 * The actual days spent counter
+	 * 
+	 * @var     int
+	 */
+	public $actualDaysSpent = 0;
+	
+	/**
+	 * The total days counter
+	 * 
+	 * @var     int
+	 */
+	public $totalDays = 0;
+	
+	/**
+	 * The actual Total Days counter
+	 * 
+	 * @var     int
+	 */
+	public $actualTotalDays = 0;
+	
+	/**
+	 * The project week time counter
+	 * 
+	 * @var     int
+	 */
+	public $projectWeekTime = 0;
+	
+	/**
+	 * The project month time counter
+	 * 
+	 * @var     int
+	 */
+	public $projectMonthTime = 0;
+	
 	/**
 	 * The Joomla Version
 	 * 
@@ -205,7 +359,7 @@ class Structure extends Get
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Structure '.$nr.']';	
 		}
@@ -567,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';
@@ -587,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)
@@ -605,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)
@@ -621,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)
@@ -939,34 +1102,11 @@ class Structure extends Get
 	 * @param   string   $dir  The path to folder to remove
 	 * @param   boolean   $git  if there is a git folder in that must not be removed
 	 *
-	 * @return  boolean   True in all is removed
+	 * @return  boolean   True if all is removed
 	 * 
 	 */
 	protected function removeFolder($dir, $git = false)
 	{
-		if (JFolder::exists($dir))
-		{
-			$it = new RecursiveDirectoryIterator($dir);
-			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
-			foreach ($it as $file)
-			{
-				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
-				if ($file->isDir())
-				{
-					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
-					JFolder::delete($file->getPathname());
-				}
-				else
-				{
-					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
-					JFile::delete($file->getPathname());
-				}
-			}
-			if (!$git && JFolder::delete($dir))
-			{
-				return true;
-			}
-		}
-		return false;
+		return ComponentbuilderHelper::removeFolder($dir, $git);
 	}
 }

admin/helpers/compiler/c_Fields.php

@@ -311,7 +311,14 @@ class Fields extends Structure
 	 * 
 	 * @var    array
 	 */
-	public $fieldsNames = array();
+	public $fieldsNames = array();	
+	
+	/**
+	 * Set unique Names
+	 * 
+	 * @var    array
+	 */
+	public $uniqueNames = array();
 	
 	/**
 	 * Default Fields
@@ -344,7 +351,7 @@ class Fields extends Structure
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Fields '.$nr.']';	
 		}
@@ -368,6 +375,19 @@ class Fields extends Structure
 			// setup the list view and single view name
 			$listViewName = ComponentbuilderHelper::safeString($view['settings']->name_list);
 			$viewName = ComponentbuilderHelper::safeString($view['settings']->name_single);
+			// set some place holder for this view
+			$this->placeholders['###view###'] = $viewName;
+			$this->placeholders['###VIEW###'] = strtoupper($viewName);
+			$this->placeholders['###View###'] = ucfirst($viewName);
+			$this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
+			$this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
+			$this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];			
+			$this->placeholders['###views###'] = $listViewName;
+			$this->placeholders['###VIEWS###'] = strtoupper($listViewName);
+			$this->placeholders['###Views###'] = ucfirst($listViewName);
+			$this->placeholders['[[[views]]]'] = $this->placeholders['###views###'];
+			$this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###'];
+			$this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###'];
 			// add metadata to the view
 			if ($view['metadata'])
 			{
@@ -385,12 +405,12 @@ class Fields extends Structure
 				$readOnly = "\t\t\t" . 'readonly="true"' . PHP_EOL."\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
-			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
-			$langViews = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
+			$langView = $this->langPrefix . '_' . $this->placeholders['###VIEW###'];
+			$langViews = $this->langPrefix . '_' . $this->placeholders['###VIEWS###'];
 			// set default lang
 			$this->langContent[$this->lang][$langView] = $view['settings']->name_single;
 			$this->langContent[$this->lang][$langViews] = $view['settings']->name_list;
-			// set the singel name
+			// set the single name
 			$viewSingleName = ComponentbuilderHelper::safeString($view['settings']->name_single, 'W');
 			// set global item strings
 			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED'] = "%s " . $view['settings']->name_list . " archived.";
@@ -427,20 +447,21 @@ class Fields extends Structure
 			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
 			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
 			
+			// check if the same field is added multiple times
+			foreach ($view['settings']->fields as $field)
+			{
+				$name = ComponentbuilderHelper::safeString($field['settings']->name);
+				$this->setUniqueNameKeeper($field, $view['settings']->type, $name, $viewName);
+			}
 			// start adding dynamc fields
 			$dynamcfields = '';
-			// place holders
-			$placeholders = array(
-			    '###component###' => $component,
-			    '###view###' => $viewName,
-			    '###views###' => $listViewName);
 			$spacerCounter = 'a';
 			// set the custom table key
 			$dbkey = 'g';
 			// TODO we should add the global and local view switch if field for front end
 			foreach ($view['settings']->fields as $field)
 			{
-				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $this->placeholders, $dbkey, true);
 			}
 			
 			// set the defautl fields
@@ -633,6 +654,8 @@ class Fields extends Structure
 				$fieldSet[] = "\t\t</fieldset>";
 				$fieldSet[] = "\t</fields>";
 			}
+			// just to be safe, lets clear the view placeholders
+			$this->clearFromPlaceHolders('view');
 			// retunr the set
 			return implode(PHP_EOL, $fieldSet);
 		}
@@ -934,12 +957,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))
@@ -1135,18 +1158,18 @@ class Fields extends Structure
 	/**
 	 * set field attributes
 	 * 
-	 * @param   array    $field  The field data
-	 * @param   int      $viewType The view type
-	 * @param   string   $name The field name
-	 * @param   string   $typeName The field type
-	 * @param   boolean  $multiple The switch to set multiple selection option
-	 * @param   string   $langLabel The language string for field label
-	 * @param   string   $langView The language string of the view
+	 * @param   array    $field         The field data
+	 * @param   int      $viewType      The view type
+	 * @param   string   $name          The field name
+	 * @param   string   $typeName      The field type
+	 * @param   boolean  $multiple      The switch to set multiple selection option
+	 * @param   string   $langLabel     The language string for field label
+	 * @param   string   $langView      The language string of the view
 	 * @param   string   $spacerCounter The space counter value
-	 * @param   string   $listViewName The list view name
-	 * @param   string   $viewName The singel view name
-	 * @param   array    $placeholders The place holder and replace values
-	 * @param   boolean  $repeatable The repeatable field switch
+	 * @param   string   $listViewName  The list view name
+	 * @param   string   $viewName      The singel view name
+	 * @param   array    $placeholders  The place holder and replace values
+	 * @param   boolean  $repeatable    The repeatable field switch
 	 *
 	 * @return  array The field attributes
 	 * 
@@ -1219,7 +1242,7 @@ class Fields extends Structure
 					{
 						// quick check if this is a category linked to view page
 						$requeSt_id = ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"');
-						if (strpos($requeSt_id, '_request_id') !== false)
+						if (strpos($requeSt_id, '_request_id') !== false || strpos($requeSt_id, '_request_catid') !== false)
 						{
 							// keep it then, don't change
 							$xmlValue = $requeSt_id;
@@ -1264,12 +1287,16 @@ class Fields extends Structure
 					// use field core name only if not found in xml
 					if (!ComponentbuilderHelper::checkString($xmlValue))
 					{
+						// make sure the XML name is uniqe, so we can add one field multiple times
+						$name = $this->uniqueName($name, $viewName);
 						$xmlValue = $name;
 					}
 					// set the name if found
 					else
 					{
-						$name = $xmlValue;
+						// make sure the XML name is uniqe, so we can add one field multiple times
+						$xmlValue = $this->uniqueName($xmlValue, $viewName);
+						$name = $this->setPlaceholders($xmlValue, $placeholders);
 					}
 				}
 				elseif ($property['name'] === 'extension' || $property['name'] === 'directory')
@@ -1381,6 +1408,14 @@ class Fields extends Structure
 				// check if translatable
 				if (ComponentbuilderHelper::checkString($xmlValue) && $property['translatable'] == 1)
 				{
+					// update lable if field use multiple times
+					if ($property['name'] === 'label')
+					{
+						if (isset($fieldAttributes['name']) && isset($this->uniqueNames[$viewName]['names'][$fieldAttributes['name']]))
+						{
+							$xmlValue .= ' (' . ComponentbuilderHelper::safeString($this->uniqueNames[$viewName]['names'][$fieldAttributes['name']]) . ')';
+						}
+					}
 					// replace placeholders
 					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 					// insure custom lables dont get messed up
@@ -1432,18 +1467,17 @@ class Fields extends Structure
 							$xmlValue = $property['example'];
 						}
 					}
-
-					$fieldAttributes[$property['name']] = $xmlValue;
-
 					// load to langBuilder down the line
 					if ($property['name'] === 'label')
 					{
-						$langLabel = $xmlValue;
 						if ($setCustom)
 						{
 							$fieldAttributes['custom']['label'] = $customLabel;
 						}
+						$langLabel = $xmlValue;
 					}
+					// now set the value
+					$fieldAttributes[$property['name']] = $xmlValue;
 				}
 			}
 			// do some nice twigs beyond the default
@@ -1460,6 +1494,123 @@ class Fields extends Structure
 		return $fieldAttributes;
 	}
 
+	/**
+	 * Keep track of the field names, to see if it used multiple times
+	 * 
+	 * @param   array    $field     The field data
+	 * @param   string   $typeName  The field type
+	 * @param   string   $name      The field name
+	 * @param   string   $viewName  The singel view name
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setUniqueNameKeeper(&$field, &$typeName, &$name, $viewName)
+	{
+		// setup a default field
+		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
+		{
+			foreach ($field['settings']->properties as $property)
+			{
+				// reset
+				$xmlValue = '';
+				if ($property['name'] === 'name')
+				{
+					// if category then name must be catid (only one per view)
+					if ($typeName === 'category')
+					{
+						// only one allowed
+						return;
+					}
+					// if tag is set then enable all tag options for this view (only one per view)
+					elseif ($typeName === 'tag')
+					{
+						// only one allowed
+						return;
+					}
+					// if the field is set as alias it must be called alias
+					elseif (isset($field['alias']) && $field['alias'])
+					{
+						// only one allowed
+						return;
+					}
+					elseif ($typeName === 'spacer')
+					{
+						// not needed here
+						return;
+					}
+					else
+					{
+						$xmlValue = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'));
+					}
+
+					// use field core name only if not found in xml
+					if (!ComponentbuilderHelper::checkString($xmlValue))
+					{
+						$xmlValue = $name;
+					}
+					// make sure the XML name is uniqe, so we can add one field multiple times
+					return $this->setUniqueNameCounter($xmlValue, $viewName);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Count how many times the same field is used per view
+	 * 
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setUniqueNameCounter($name, $view)
+	{
+		if (!isset($this->uniqueNames[$view]))
+		{
+			$this->uniqueNames[$view] = array();
+			$this->uniqueNames[$view]['counter'] = array();
+			$this->uniqueNames[$view]['names'] = array();
+		}
+		if (!isset($this->uniqueNames[$view]['counter'][$name]))
+		{
+			$this->uniqueNames[$view]['counter'][$name] = 1;
+			return;
+		}
+		// count how many times the field is used
+		$this->uniqueNames[$view]['counter'][$name]++;
+		return;
+	}
+	
+	/**
+	 * Naming each field with an unique name
+	 * 
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  string   the name
+	 * 
+	 */
+	protected function uniqueName($name, $view)
+	{
+		// only increment if the field name is used multiple times
+		if (isset($this->uniqueNames[$view]['counter'][$name]) && $this->uniqueNames[$view]['counter'][$name] > 1)
+		{
+			$counter = $this->uniqueNames[$view]['counter'][$name];
+			$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			while (isset($this->uniqueNames[$view]['names'][$uniqueName]))
+			{
+				$counter--;
+				$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			}
+			// set the new name
+			$this->uniqueNames[$view]['names'][$uniqueName] = $counter;
+			return $uniqueName;
+		}
+		return $name;
+	}
+
 
 	/**
 	 * set Builders
@@ -1639,7 +1790,7 @@ class Fields extends Structure
 		// set the custom builder
 		if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable')
 		{
-			$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]))
 			{

admin/helpers/compiler/e_Interpretation.php

@@ -48,6 +48,9 @@ class Interpretation extends Fields
 	public $otherWhere			= array();
 	public $DashboardGetCustomData		= array();
 	public $customAdminAdded		= array();
+	
+	protected $hasCatIdRequest		= array();
+	protected $hasIdRequest			= array();
 
 	/**
 	 * Constructor
@@ -72,7 +75,7 @@ class Interpretation extends Fields
 	 */
 	private function setLine($nr)
 	{
-		if ($this->loadLineNr)
+		if ($this->debugLinenr)
 		{
 			return ' [Interpretation '.$nr.']';	
 		}
@@ -1073,15 +1076,27 @@ class Interpretation extends Fields
 			$xml .= PHP_EOL."\t\t\t".'<![CDATA['.$lang.'_DESC]]>';
 			$xml .= PHP_EOL."\t\t".'</message>';
 			$xml .= PHP_EOL."\t".'</layout>';
-			if (isset($this->hasIdRequest[$view['settings']->code]))
+			if (isset($this->hasIdRequest[$view['settings']->code]) || isset($this->hasCatIdRequest[$view['settings']->code]))
 			{
-				$requestField = str_replace($view['settings']->code.'_request_id', 'id', $this->hasIdRequest[$view['settings']->code]);
 				
 				$xml .= PHP_EOL."\t".'<!--'.$this->setLine(__LINE__).' Add fields to the request variables for the layout. -->';
 				$xml .= PHP_EOL."\t".'<fields name="request">';
 				$xml .= PHP_EOL."\t\t".'<fieldset name="request"';
 				$xml .= PHP_EOL."\t\t\t".'addfieldpath="/administrator/components/com_'.$this->fileContentStatic['###component###'].'/models/fields">';
-				$xml .= PHP_EOL."\t\t\t".$requestField;
+				if (isset($this->hasIdRequest[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->hasIdRequest[$view['settings']->code]))
+				{
+					foreach($this->hasIdRequest[$view['settings']->code] as $requestFieldXML)
+					{
+						$xml .= PHP_EOL."\t\t\t".$requestFieldXML;
+					}
+				}
+				if (isset($this->hasCatIdRequest[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->hasCatIdRequest[$view['settings']->code]))
+				{
+					foreach($this->hasCatIdRequest[$view['settings']->code] as $requestFieldXML)
+					{
+						$xml .= PHP_EOL."\t\t\t".$requestFieldXML;
+					}
+				}
 				$xml .= PHP_EOL."\t\t".'</fieldset>';
 				$xml .= PHP_EOL."\t".'</fields>';
 			}
@@ -1469,15 +1484,15 @@ class Interpretation extends Fields
 					break;
 					case 5:
 					// COM_COMPONENTBUILDER_DYNAMIC_GET_CATEGORIES
-					$string = "";
+					$string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic category filter is not ready.";
 					break;
 					case 6:
 					// COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS
-					$string = "";
+					$string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic tags filter is not ready.";
 					break;
 					case 7:
 					// COM_COMPONENTBUILDER_DYNAMIC_GET_DATE
-					$string = "";
+					$string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic date filter is not ready.";
 					break;
 					case 8:
 					// COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR
@@ -1594,7 +1609,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')
 					{
@@ -1607,21 +1622,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";
@@ -1632,7 +1655,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])))
@@ -2804,7 +2828,14 @@ class Interpretation extends Fields
                                                 $keyCode = ComponentbuilderHelper::safeString($custom_button['name']);
 						$this->langContent[$this->lang][$keyLang] = trim($custom_button['name']);
 						// add cpanel button TODO does not work well on site with permissions
-						$buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))";
+						if ($custom_button['target'] == 2)
+						{
+							$buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))";
+						}
+						else
+						{
+							$buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))";
+						}
 						$buttons[] = "\t".$tab."\t{";
 						$buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button.";
 						$buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);";
@@ -2818,7 +2849,7 @@ class Interpretation extends Fields
                                                 $keyCode = ComponentbuilderHelper::safeString($custom_button['name']);
 						$this->langContent[$this->lang][$keyLang] = trim($custom_button['name']);
 						// add cpanel button TODO does not work well on site with permissions
-						$buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))";
+						$buttons[] = "\t".$tab."\tif (\$this->user->authorise('".$viewName.".".$keyCode."'))";
 						$buttons[] = "\t".$tab."\t{";
 						$buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button.";
 						$buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewsName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);";
@@ -2850,7 +2881,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkString($view['settings']->php_controller) && $view['settings']->php_controller != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
-					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER'.$list.'###'] =
+					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] =
 					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_controller, $this->placeholders);
 					if ('site' === $this->target)
 					{
@@ -2865,7 +2896,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkString($view['settings']->php_model) && $view['settings']->php_model != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
-					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD'.$list.'###'] =
+					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] =
 					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_model, $this->placeholders);
 				}
 			}
@@ -3406,22 +3437,9 @@ class Interpretation extends Fields
 		}
 	}
 
-	public function writeFile($path,$data)
+	public function writeFile($path, $data)
 	{
-		$fh = fopen($path, "w");
-		if (!is_resource($fh))
-		{
-			return false;
-		}
-		if (fwrite($fh, $data))
-		{
-			// close file.
-			fclose($fh);
-			return true;
-		}
-		// close file.
-		fclose($fh);
-		return false;
+		return ComponentbuilderHelper::writeFile($path, $data);
 	}
 
 	public function setMethodGetItem(&$view)
@@ -3669,7 +3687,7 @@ class Interpretation extends Fields
 				$checkViews = (isset($this->catCodeBuilder[$view]['views']) && ComponentbuilderHelper::checkString($this->catCodeBuilder[$view]['views'])) ? $this->catCodeBuilder[$view]['views'] : $views;
 				if (ComponentbuilderHelper::checkArray($dbStuff[$view]) && array_key_exists($view, $this->catCodeBuilder) && ($checkViews == $views))
 				{
-					$dbStuff[$view.' catagory'] = $this->getCategoryContentType($view, $views, $component);
+					$dbStuff[$view.' category'] = $this->getCategoryContentType($view, $views, $component);
 				}
 				elseif(!isset($dbStuff[$view]) || !ComponentbuilderHelper::checkArray($dbStuff[$view]))
 				{
@@ -4108,6 +4126,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')
@@ -4119,29 +4138,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)
@@ -4157,7 +4172,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;";
@@ -5083,20 +5106,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()
@@ -5124,7 +5141,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;
 			}
@@ -5132,20 +5149,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()
@@ -5156,20 +5167,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()
@@ -5177,20 +5182,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)
@@ -5744,8 +5743,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;
@@ -5881,10 +5879,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)
 			{
@@ -5940,7 +5942,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
@@ -6172,6 +6174,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 )
@@ -7197,7 +7200,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;";
@@ -7373,8 +7376,10 @@ class Interpretation extends Fields
 	{
 		// setup Ajax files
 		$target = array('admin' => 'import_'.$viewName_list);
-		$this->buildDynamique($target,'customimport');
+		$this->buildDynamique($target, 'customimport');
 		// load the custom script to the files
+		// ###IMPORT_EXT_METHOD_CUSTOM### <<<DYNAMIC>>>
+		$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_EXT_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_ext', 'import_'.$viewName_list, PHP_EOL, null, true);
                 // ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
 		$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = $this->getCustomScriptBuilder('php_import_display', 'import_'.$viewName_list, PHP_EOL, null, true);
                 // ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
@@ -7561,7 +7566,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']."'));";
@@ -9208,6 +9214,31 @@ class Interpretation extends Fields
 				$otherViews = $viewName_list;
 				$otherView = $viewName_single;
 			}
+			// load the category helper details in not already loaded
+			if (!isset($this->fileContentDynamic['category'.$otherViews]['###view###']))
+			{
+				// lets also set the category helper for this view
+				$target = array('site' => 'category'.$viewName_list);
+				$this->buildDynamique($target, 'category');
+				// insure the file gets updated
+				$this->fileContentDynamic['category'.$otherViews]['###view###'] = $otherView;
+				$this->fileContentDynamic['category'.$otherViews]['###View###'] = ucfirst($otherView);
+				$this->fileContentDynamic['category'.$otherViews]['###views###'] = $otherViews;
+				$this->fileContentDynamic['category'.$otherViews]['###Views###'] = ucfirst($otherViews);
+				// set script to global helper file
+				$includeHelper = array();
+				$includeHelper[] = "\n//".$this->setLine(__LINE__)."Insure this view category file is loaded.";
+				$includeHelper[] = "\$classname = '".$this->fileContentStatic['###component###'] . ucfirst($viewName_list) . "Categories';";
+				$includeHelper[] = "if (!class_exists(\$classname))";
+				$includeHelper[] = "{";
+				$includeHelper[] = "\t\$path = JPATH_SITE . '/components/com_".$this->fileContentStatic['###component###']."/helpers/category" . $viewName_list . ".php';";
+				$includeHelper[] = "\tif (is_file(\$path))";
+				$includeHelper[] = "\t{";
+				$includeHelper[] = "\t\tinclude_once \$path;";
+				$includeHelper[] = "\t}";
+				$includeHelper[] = "}";
+				$this->fileContentStatic['###CATEGORY_CLASS_TREES###'] .= implode("\n",$includeHelper);
+			}
 			// return category view string
 			if (isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']) && ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']))
 			{
@@ -9584,7 +9615,7 @@ class Interpretation extends Fields
 			$allow[] = PHP_EOL."\t\t\t\$catid = 0;";
 			$allow[] = "\t\t\tif (isset(\$this->getItem(\$id)->catid))";
 			$allow[] = "\t\t\t{";
-			$allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." set catagory id";
+			$allow[] = "\t\t\t\t//".$this->setLine(__LINE__)." set category id";
 			$allow[] = "\t\t\t\t\$catid = \$this->getItem(\$id)->catid;";
 			$allow[] = PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." Existing record. Can only edit in selected categories.";
 			$allow[] = "\t\t\t\t\$form->setFieldAttribute('catid', 'action', 'core.edit');";
@@ -10607,7 +10638,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 = '';
@@ -10813,7 +10844,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
 						{
@@ -11101,7 +11140,7 @@ class Interpretation extends Fields
 					{
 						$otherViews = $name_list;
 						// build lang
-						$langName = 'Catagory &nbsp;For<br />'.ComponentbuilderHelper::safeString($otherViews, 'W');
+						$langName = 'Category &nbsp;For<br />'.ComponentbuilderHelper::safeString($otherViews, 'W');
 					}
 					if(!in_array($otherViews,$catArray))
 					{
@@ -11224,7 +11263,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)); ?>";
@@ -11802,7 +11841,7 @@ class Interpretation extends Fields
 						$this->configFieldSetsCustomField[$field['tabname']][] = $xmlField;
 						// set global params to db on install
 						$fieldName = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xmlField,'name="','"'));
-						$fieldDefault = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xmlField,'default="','"'));
+						$fieldDefault = ComponentbuilderHelper::getBetween($xmlField,'default="','"');
 						if (isset($field['custom_value']) && ComponentbuilderHelper::checkString($field['custom_value']))
 						{
 							// load the Global checkin defautls
@@ -11858,25 +11897,43 @@ class Interpretation extends Fields
 				$tabCode = ComponentbuilderHelper::safeString($tab).'_custom_config';
 				$tabUpper = ComponentbuilderHelper::safeString($tab,'U');
 				$tabLower = ComponentbuilderHelper::safeString($tab);
-				// load the regust id setters for menu views
-				$viewRequest = 'name="'.$tabLower.'_request_id"';
+				// load the request id setters for menu views
+				$viewRequest = 'name="'.$tabLower.'_request_id';
 				foreach($tabFields as $et => $id_field)
 				{
 					if(strpos($id_field,$viewRequest) !== false)
 					{
-						// set the values needed to insure route is done correclty
-						$this->hasIdRequest[$tabLower] = $id_field;
+						$this->setRequestValues($tabLower, $id_field, $viewRequest, 'id', 'hasIdRequest');
 						unset($tabFields[$et]);
 					}
-					elseif (strpos($id_field,'_request_id"') !== false)
+					elseif (strpos($id_field,'_request_id') !== false)
 					{
 						// not loaded to a tab "view" name
-						$_viewRequest = ComponentbuilderHelper::getBetween($id_field,'name="','_request_id"');
-						// set the values needed to insure route is done correclty
-						$this->hasIdRequest[$_viewRequest] = $id_field;
+						$_viewRequest = ComponentbuilderHelper::getBetween($id_field,'name="','_request_id');
+						$searchIdKe = 'name="'.$_viewRequest.'_request_id';
+						$this->setRequestValues($_viewRequest, $id_field, $searchIdKe, 'id', 'hasIdRequest');
 						unset($tabFields[$et]);
 					}
 				}
+				// load the request catid setters for menu views
+				$viewRequestC = 'name="'.$tabLower.'_request_catid';
+				foreach($tabFields as $ci => $catid_field)
+				{
+					if(strpos($catid_field,$viewRequestC) !== false)
+					{
+						
+						$this->setRequestValues($tabLower, $catid_field, $viewRequestC, 'catid', 'hasCatIdRequest');
+						unset($tabFields[$ci]);
+					}
+					elseif (strpos($catid_field,'_request_catid') !== false)
+					{
+						// not loaded to a tab "view" name
+						$_viewRequestC = ComponentbuilderHelper::getBetween($catid_field,'name="','_request_catid');
+						$searchCatidKe = 'name="'.$_viewRequestC.'_request_catid';
+						$this->setRequestValues($_viewRequestC, $catid_field, $searchCatidKe, 'catid', 'hasCatIdRequest');
+						unset($tabFields[$ci]);
+					}
+				}
 				// load the global menu setters for single fields
 				$menuSetter = $tabLower.'_menu';
 				$pageSettings = array();
@@ -11907,6 +11964,29 @@ class Interpretation extends Fields
 			}
 		}
 	}
+	
+	protected function setRequestValues($view, $field, $search, $target, $store)
+	{
+		$key = ComponentbuilderHelper::getBetween($field, $search, '"');
+		if (!ComponentbuilderHelper::checkString($key))
+		{
+			// is not having special var
+			$key = $target;
+			// update field
+			$field = str_replace($search . '"', 'name="'. $key . '"', $field);
+		}
+		else
+		{
+			// update field
+			$field = str_replace($search . $key . '"', 'name="'. $key . '"', $field);
+		}
+		if (!isset($this->{$store}[$view]))
+		{
+			$this->{$store}[$view] = array();
+		}
+		// set the values needed for view requests to be made
+		$this->{$store}[$view][$key] = $field;
+	}
 
 	public function setCustomControlConfigFieldsets($lang)
 	{
@@ -13366,30 +13446,8 @@ function vdm_dkim() {
 					$this->langContent['admin'][$siteDesc]	= ' Allows the users in this group to access site '.ComponentbuilderHelper::safeString($siteName,'w').'.';
 					$this->componentGlobal[$sortKey]              = "\t\t".'<action name="site.'.$siteCode.'.access" title="'.$siteTitle.'" description="'.$siteDesc.'" />';
 				}
-                                // add the custom permissions to use the buttons of this view
-                                /* if (ComponentbuilderHelper::checkArray($site_view['settings']->custom_buttons))
-                                {
-                                       foreach ($site_view['settings']->custom_buttons as $custom_buttons)
-                                       {
-                                                $siteButtonName  = $custom_buttons['name'];
-                                                $siteButtonCode  = ComponentbuilderHelper::safeString($siteButtonName);
-                                                $siteButtonTitle = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' '.$siteButtonName.' Button Access','U');
-                                                $siteButtonDesc  = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($siteName.' '.$siteButtonName.' Button Access','U').'_DESC';
-                                                $sortButtonKey   = ComponentbuilderHelper::safeString($siteButtonTitle);
-                                                $this->langContent['admin'][$siteButtonTitle]	= $siteName.' '.$siteButtonName.' Button Access';
-                                                $this->langContent['admin'][$siteButtonDesc]	= ' Allows the users in this group to access the '.ComponentbuilderHelper::safeString($siteButtonName,'w').' button.';
-                                                $this->componentGlobal[$sortButtonKey]  = "\t\t".'<action name="'.$siteCode.'.'.$siteButtonCode.'" title="'.$siteButtonTitle.'" description="'.$siteButtonDesc.'" />';
-                                       }
-                                }
-				// add menu controll view that has menus options
-				foreach ($menuControllers  as $menuController)
-				{
-					// add menu controll view that has menus options
-					if ($site_view[$menuController])
-					{
-						// TODO for CUSTOM MENUS!!!
-					}
-				} */
+				// add the custom permissions to use the buttons of this view
+				$this->addCustomButtonPermissions($site_view['settings'], $siteName, $siteCode);
                         }
                 }
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))

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.']';	
 		}
@@ -80,13 +80,13 @@ class Infusion extends Interpretation
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			// ###COMPONENT###
-			$this->fileContentStatic['###COMPONENT###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
+			$this->fileContentStatic['###COMPONENT###'] = $this->placeholders['###COMPONENT###'];
 
 			// ###Component###
-			$this->fileContentStatic['###Component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'F');
+			$this->fileContentStatic['###Component###'] = $this->placeholders['###Component###'];
 
 			// ###component###
-			$this->fileContentStatic['###component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$this->fileContentStatic['###component###'] = $this->placeholders['###component###'];
 
 			// ###COMPANYNAME###
 			$this->fileContentStatic['###COMPANYNAME###'] = trim(JFilterOutput::cleanText($this->componentData->companyname));
@@ -132,20 +132,13 @@ class Infusion extends Interpretation
 
 			// ###ACCESS_SECTIONS###
 			$this->fileContentStatic['###ACCESS_SECTIONS###'] = $this->setAccessSections();
-
-			// set component place holders
-			$this->placeholders = array(
-				'###Component###'		=> $this->fileContentStatic['###Component###'],
-				'###component###'		=> $this->fileContentStatic['###component###'],
-				'###COMPONENT###'		=> $this->fileContentStatic['###COMPONENT###'],
-				'[[[Component]]]'		=> $this->fileContentStatic['###Component###'],
-				'[[[component]]]'		=> $this->fileContentStatic['###component###'],
-				'[[[COMPONENT]]]'		=> $this->fileContentStatic['###COMPONENT###']
-				);
 			
 			// ###CONFIG_FIELDSETS###
 			$keepLang = $this->lang;
 			$this->lang = 'admin';
+			
+			// start loading the category tree scripts
+			 $this->fileContentStatic['###CATEGORY_CLASS_TREES###'] = '';
 			// run the field sets for first time
 			$this->setConfigFieldsets(1);
 			$this->lang = $keepLang;
@@ -216,6 +209,9 @@ class Infusion extends Interpretation
                         // start dynamic build
                         foreach ($this->componentData->admin_views as $view)
                         {
+				// just to be safe, lets clear the view placeholders
+				$this->clearFromPlaceHolders('view');
+				// set the target
                                 $this->target	= 'admin';
                                 $this->lang     = 'admin';
                                 // set main keys
@@ -253,11 +249,11 @@ class Infusion extends Interpretation
 
                                         // set some place holder for the views
                                         $this->placeholders['###view###'] = $viewName_single;
-                                        $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['###View###'] = $viewName_f;
+                                        $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['[[[view]]]'] = $viewName_single;
-                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
                                         $this->placeholders['[[[View]]]'] = $viewName_f;
+                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
 
                                         // set license per view if needed
                                         $this->setLockLicensePer($viewName_single, $this->target);
@@ -389,11 +385,11 @@ class Infusion extends Interpretation
 
                                         // set some place holder for the views
                                         $this->placeholders['###views###'] = $viewName_list;
-                                        $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['###Views###'] = $viewsName_f;
+                                        $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['[[[views]]]'] = $viewName_list;
-                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
                                         $this->placeholders['[[[Views]]]'] = $viewsName_f;
+                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
 
                                         // set the export/import option
                                         if ($view['port'])
@@ -1071,33 +1067,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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -30,20 +30,32 @@ 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
 	 */
 	public static function autoLoader($type = 'compiler')
 	{
-		// load the compiler classes
-		foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/".$type."/*.php") as $autoFile)
+		// load the type classes
+		if ('smart' !== $type)
 		{
-			require_once $autoFile;
+			foreach (glob(JPATH_ADMINISTRATOR."/components/com_componentbuilder/helpers/".$type."/*.php") as $autoFile)
+			{
+				require_once $autoFile;
+			}
 		}
 		// load only if compiler
-		if ('compiler' == $type)
+		if ('compiler' === $type)
 		{
 			// import the Joomla librarys
 			jimport('joomla.filesystem.file');
@@ -53,6 +65,15 @@ abstract class ComponentbuilderHelper
 			// include class to minify js
 			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/js.php';
 		}
+		// load only if smart
+		if ('smart' === $type)
+		{
+			// import the Joomla libraries
+			jimport('joomla.filesystem.file');
+			jimport('joomla.filesystem.folder');
+			jimport('joomla.filesystem.archive');
+			jimport('joomla.application.component.modellist');
+		}
 		// load this for all
 		jimport('joomla.application');
 	}
@@ -66,6 +87,108 @@ abstract class ComponentbuilderHelper
 		$extruder = new Extrusion($data);
 	}
 
+	/**
+	* 	The zipper method
+	**/
+	public static function zip($workingDIR, &$filepath)
+	{
+		// store the current joomla working directory
+		$joomla = getcwd();
+
+		// we are changing the working directory to the component temp folder
+		chdir($workingDIR);
+
+		// the full file path of the zip file
+		$filepath = JPath::clean($filepath);
+
+		// delete an existing zip file (or use an exclusion parameter in JFolder::files()
+		JFile::delete($filepath);
+
+		// get a list of files in the current directory tree
+		$files = JFolder::files('.', '', true, true);
+		$zipArray = array();
+		// setup the zip array
+		foreach ($files as $file)
+		{
+		   $tmp = array();
+		   $tmp['name'] = str_replace('./', '', $file);
+		   $tmp['data'] = JFile::read($file);
+		   $tmp['time'] = filemtime($file);
+		   $zipArray[] = $tmp;
+		}
+
+		// change back to joomla working directory
+		chdir($joomla);
+
+		// get the zip adapter
+		$zip = JArchive::getAdapter('zip');
+
+		//create the zip file
+		if ($zip->create($filepath, $zipArray))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Remove folders with files
+	 * 
+	 * @param   string   $dir  The path to folder to remove
+	 * @param   boolean   $git  if there is a git folder in that must not be removed
+	 *
+	 * @return  boolean   True in all is removed
+	 * 
+	 */
+	public static function removeFolder($dir, $git = false)
+	{
+		if (JFolder::exists($dir))
+		{
+			$it = new RecursiveDirectoryIterator($dir);
+			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+			foreach ($it as $file)
+			{
+				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
+				if ($file->isDir())
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFolder::delete($file->getPathname());
+				}
+				else
+				{
+					if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
+					JFile::delete($file->getPathname());
+				}
+			}
+			if (!$git && JFolder::delete($dir))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	* 	Create file and write data to the file
+	**/
+	public static function writeFile($path, $data)
+	{
+		$fh = fopen($path, "w");
+		if (!is_resource($fh))
+		{
+			return false;
+		}
+		if (fwrite($fh, $data))
+		{
+			// close file.
+			fclose($fh);
+			return true;
+		}
+		// close file.
+		fclose($fh);
+		return false;
+	}
+
 	/**
 	* 	The user notice info File Name
 	**/
@@ -278,7 +401,737 @@ abstract class ComponentbuilderHelper
 			return true;
 		}
 		return false;		
-	} 
+	}
+			
+	public static function getImportScripts($type, $fieldName = false)
+	{
+		// if field name is pased the convert to type
+		if ($fieldName)
+		{
+			$fieldNames = array(
+				'php_import_display' => 'display',
+				'php_import_setdata' => 'setdata',
+				'php_import_save' => 'save',
+				'html_import_view' => 'view',
+				'php_import' => 'import',
+				'php_import_ext' => 'ext'
+			);
+			// first check if the field name is found
+			if (isset($fieldNames[$type]))
+			{
+				$type = $fieldNames[$type];
+			}
+			else
+			{
+				return '';
+			}
+		}
+		$script = array();
+		if ('display' === $type)
+		{
+			// set the display script
+			$script['display'][] = "\tprotected \$headerList;";
+			$script['display'][] = "\tprotected \$hasPackage = false;";
+			$script['display'][] = "\tprotected \$headers;";
+			$script['display'][] = "\tprotected \$hasHeader = 0;";
+			$script['display'][] = "\tprotected \$dataType;";
+			$script['display'][] = "\n\tpublic function display(\$tpl = null)";
+			$script['display'][] = "\t{";
+			$script['display'][] = "\t\tif (\$this->getLayout() !== 'modal')";
+			$script['display'][] = "\t\t{";
+			$script['display'][] = "\t\t\t// Include helper submenu";
+			$script['display'][] = "\t\t\t###-#-#-Component###Helper::addSubmenu('import');";
+			$script['display'][] = "\t\t}";
+			$script['display'][] = "\n\t\t// Check for errors.";
+			$script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){";
+			$script['display'][] = "\t\t\tJError::raiseError(500, implode('<br />', \$errors));";
+			$script['display'][] = "\t\t\treturn false;";
+			$script['display'][] = "\t\t}";
+			$script['display'][] = "\n\t\t\$paths = new stdClass;";
+			$script['display'][] = "\t\t\$paths->first = '';";
+			$script['display'][] = "\t\t\$state = \$this->get('state');";
+			$script['display'][] = "\n\t\t\$this->paths = &\$paths;";
+			$script['display'][] = "\t\t\$this->state = &\$state;";
+			$script['display'][] = "\t\t// get global action permissions";
+			$script['display'][] = "\t\t\$this->canDo = ###-#-#-Component###Helper::getActions('import');";
+			$script['display'][] = "\n\t\t// We don't need toolbar in the modal window.";
+			$script['display'][] = "\t\tif (\$this->getLayout() !== 'modal')";
+			$script['display'][] = "\t\t{";
+			$script['display'][] = "\t\t\t\$this->addToolbar();";
+			$script['display'][] = "\t\t\t\$this->sidebar = JHtmlSidebar::render();";
+			$script['display'][] = "\t\t}";
+			$script['display'][] = "\n\t\t// get the session object";
+			$script['display'][] = "\t\t\$session = JFactory::getSession();";
+			$script['display'][] = "\t\t// check if it has package";
+			$script['display'][] = "\t\t\$this->hasPackage \t= \$session->get('hasPackage', false);";
+			$script['display'][] = "\t\t\$this->dataType \t= \$session->get('dataType', false);";
+			$script['display'][] = "\t\tif(\$this->hasPackage && \$this->dataType)";
+			$script['display'][] = "\t\t{";
+			$script['display'][] = "\t\t\t\$this->headerList \t= json_decode(\$session->get(\$this->dataType.'_VDM_IMPORTHEADERS', false),true);";
+			$script['display'][] = "\t\t\t\$this->headers \t\t= ###-#-#-Component###Helper::getFileHeaders(\$this->dataType);";
+			$script['display'][] = "\t\t\t// clear the data type";
+			$script['display'][] = "\t\t\t\$session->clear('dataType');";
+			$script['display'][] = "\t\t}";
+			$script['display'][] = "\n\t\t// Display the template";
+			$script['display'][] = "\t\tparent::display(\$tpl);";
+			$script['display'][] = "\t}";
+		}
+		elseif ('setdata' === $type)
+		{
+			// set the setdata script
+			$script['setdata'] = array();
+			$script['setdata'][] = "\t/**";
+			$script['setdata'][] = "\t* Set the data from the spreadsheet to the database";
+			$script['setdata'][] = "\t*";
+			$script['setdata'][] = "\t* @param string  \$package Paths to the uploaded package file";
+			$script['setdata'][] = "\t*";
+			$script['setdata'][] = "\t* @return  boolean false on failure";
+			$script['setdata'][] = "\t*";
+			$script['setdata'][] = "\t**/";
+			$script['setdata'][] = "\tprotected function setData(\$package,\$table,\$target_headers)";
+			$script['setdata'][] = "\t{";
+			$script['setdata'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$target_headers))";
+			$script['setdata'][] = "\t\t{";
+			$script['setdata'][] = "\t\t\t// make sure the file is loaded\t\t";
+			$script['setdata'][] = "\t\t\tJLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');";
+			$script['setdata'][] = "\t\t\t\$jinput = JFactory::getApplication()->input;";
+			$script['setdata'][] = "\t\t\tforeach(\$target_headers as \$header)";
+			$script['setdata'][] = "\t\t\t{";
+			$script['setdata'][] = "\t\t\t\t\$data['target_headers'][\$header] = \$jinput->getString(\$header, null);";
+			$script['setdata'][] = "\t\t\t}";
+			$script['setdata'][] = "\t\t\t// set the data";
+			$script['setdata'][] = "\t\t\tif(isset(\$package['dir']))";
+			$script['setdata'][] = "\t\t\t{";
+			$script['setdata'][] = "\t\t\t\t\$inputFileType = PHPExcel_IOFactory::identify(\$package['dir']);";
+			$script['setdata'][] = "\t\t\t\t\$excelReader = PHPExcel_IOFactory::createReader(\$inputFileType);";
+			$script['setdata'][] = "\t\t\t\t\$excelReader->setReadDataOnly(true);";
+			$script['setdata'][] = "\t\t\t\t\$excelObj = \$excelReader->load(\$package['dir']);";
+			$script['setdata'][] = "\t\t\t\t\$data['array'] = \$excelObj->getActiveSheet()->toArray(null, true,true,true);";
+			$script['setdata'][] = "\t\t\t\t\$excelObj->disconnectWorksheets();";
+			$script['setdata'][] = "\t\t\t\tunset(\$excelObj);";
+			$script['setdata'][] = "\t\t\t\treturn \$this->save(\$data,\$table);";
+			$script['setdata'][] = "\t\t\t}";
+			$script['setdata'][] = "\t\t}";
+			$script['setdata'][] = "\t\treturn false;";
+			$script['setdata'][] = "\t}";
+		}
+		elseif ('save' === $type)
+		{
+			$script['save'] = array();
+			$script['save'][] = "\t/**";
+			$script['save'][] = "\t* Save the data from the file to the database";
+			$script['save'][] = "\t*";
+			$script['save'][] = "\t* @param string  \$package Paths to the uploaded package file";
+			$script['save'][] = "\t*";
+			$script['save'][] = "\t* @return  boolean false on failure";
+			$script['save'][] = "\t*";
+			$script['save'][] = "\t**/";
+			$script['save'][] = "\tprotected function save(\$data,\$table)";
+			$script['save'][] = "\t{";
+			$script['save'][] = "\t\t// import the data if there is any";
+			$script['save'][] = "\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']))";
+			$script['save'][] = "\t\t{";
+			$script['save'][] = "\t\t\t// get user object";
+			$script['save'][] = "\t\t\t\$user  \t\t= JFactory::getUser();";
+			$script['save'][] = "\t\t\t// remove header if it has headers";
+			$script['save'][] = "\t\t\t\$id_key \t= \$data['target_headers']['id'];";
+			$script['save'][] = "\t\t\t\$published_key \t= \$data['target_headers']['published'];";
+			$script['save'][] = "\t\t\t\$ordering_key \t= \$data['target_headers']['ordering'];";
+			$script['save'][] = "\t\t\t// get the first array set";
+			$script['save'][] = "\t\t\t\$firstSet = reset(\$data['array']);";
+			$script['save'][] = "";
+			$script['save'][] = "\t\t\t// check if first array is a header array and remove if true";
+			$script['save'][] = "\t\t\tif(\$firstSet[\$id_key] == 'id' || \$firstSet[\$published_key] == 'published' || \$firstSet[\$ordering_key] == 'ordering')";
+			$script['save'][] = "\t\t\t{";
+			$script['save'][] = "\t\t\t\tarray_shift(\$data['array']);";
+			$script['save'][] = "\t\t\t}";
+			$script['save'][] = "\t\t\t";
+			$script['save'][] = "\t\t\t// make sure there is still values in array and that it was not only headers";
+			$script['save'][] = "\t\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']) && \$user->authorise(\$table.'.import', 'com_###-#-#-component###') && \$user->authorise('core.import', 'com_###-#-#-component###'))";
+			$script['save'][] = "\t\t\t{";
+			$script['save'][] = "\t\t\t\t// set target.";
+			$script['save'][] = "\t\t\t\t\$target\t= array_flip(\$data['target_headers']);";
+			$script['save'][] = "\t\t\t\t// Get a db connection.";
+			$script['save'][] = "\t\t\t\t\$db = JFactory::getDbo();";
+			$script['save'][] = "\t\t\t\t// set some defaults";
+			$script['save'][] = "\t\t\t\t\$todayDate\t\t= JFactory::getDate()->toSql();";
+			$script['save'][] = "\t\t\t\t// get global action permissions";
+			$script['save'][] = "\t\t\t\t\$canDo\t\t\t= ###-#-#-Component###Helper::getActions(\$table);";
+			$script['save'][] = "\t\t\t\t\$canEdit\t\t= \$canDo->get('core.edit');";
+			$script['save'][] = "\t\t\t\t\$canState\t\t= \$canDo->get('core.edit.state');";
+			$script['save'][] = "\t\t\t\t\$canCreate\t\t= \$canDo->get('core.create');";
+			$script['save'][] = "\t\t\t\t\$hasAlias\t\t= \$this->getAliasesUsed(\$table);";
+			$script['save'][] = "\t\t\t\t// prosses the data";
+			$script['save'][] = "\t\t\t\tforeach(\$data['array'] as \$row)";
+			$script['save'][] = "\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\$found = false;";
+			$script['save'][] = "\t\t\t\t\tif (isset(\$row[\$id_key]) && is_numeric(\$row[\$id_key]) && \$row[\$id_key] > 0)";
+			$script['save'][] = "\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t// raw items import & update!";
+			$script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);";
+			$script['save'][] = "\t\t\t\t\t\t\$query";
+			$script['save'][] = "\t\t\t\t\t\t\t->select('version')";
+			$script['save'][] = "\t\t\t\t\t\t\t->from(\$db->quoteName('#__###-#-#-component###_'.\$table))";
+			$script['save'][] = "\t\t\t\t\t\t\t->where(\$db->quoteName('id') . ' = '. \$db->quote(\$row[\$id_key]));";
+			$script['save'][] = "\t\t\t\t\t\t// Reset the query using our newly populated query object.";
+			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
+			$script['save'][] = "\t\t\t\t\t\t\$db->execute();";
+			$script['save'][] = "\t\t\t\t\t\t\$found = \$db->getNumRows();";
+			$script['save'][] = "\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t";
+			$script['save'][] = "\t\t\t\t\tif(\$found && \$canEdit)";
+			$script['save'][] = "\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t// update item";
+			$script['save'][] = "\t\t\t\t\t\t\$id \t\t= \$row[\$id_key];";
+			$script['save'][] = "\t\t\t\t\t\t\$version\t= \$db->loadResult();";
+			$script['save'][] = "\t\t\t\t\t\t// reset all buckets";
+			$script['save'][] = "\t\t\t\t\t\t\$query \t\t= \$db->getQuery(true);";
+			$script['save'][] = "\t\t\t\t\t\t\$fields \t= array();";
+			$script['save'][] = "\t\t\t\t\t\t// Fields to update.";
+			$script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)";
+			$script['save'][] = "\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t// ignore column";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update modified";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('modified_by' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update modified";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('modified' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update version";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = (int) \$version + 1;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// verify publish authority";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('published' == \$target[\$key] && !\$canState)";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// set to update array";
+			$script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$cell;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$db->quote(\$cell);";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . \" = ''\";";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t// load the defaults";
+			$script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified_by') . ' = ' . \$db->quote(\$user->id);";
+			$script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified') . ' = ' . \$db->quote(\$todayDate);";
+			$script['save'][] = "\t\t\t\t\t\t// Conditions for which records should be updated.";
+			$script['save'][] = "\t\t\t\t\t\t\$conditions = array(";
+			$script['save'][] = "\t\t\t\t\t\t\t\$db->quoteName('id') . ' = ' . \$id";
+			$script['save'][] = "\t\t\t\t\t\t);";
+			$script['save'][] = "\t\t\t\t\t\t";
+			$script['save'][] = "\t\t\t\t\t\t\$query->update(\$db->quoteName('#__###-#-#-component###_'.\$table))->set(\$fields)->where(\$conditions);";
+			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
+			$script['save'][] = "\t\t\t\t\t\t\$db->execute();";
+			$script['save'][] = "\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\telseif (\$canCreate)";
+			$script['save'][] = "\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t// insert item";
+			$script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);";
+			$script['save'][] = "\t\t\t\t\t\t// reset all buckets";
+			$script['save'][] = "\t\t\t\t\t\t\$columns \t= array();";
+			$script['save'][] = "\t\t\t\t\t\t\$values \t= array();";
+			$script['save'][] = "\t\t\t\t\t\t\$version\t= false;";
+			$script['save'][] = "\t\t\t\t\t\t// Insert columns. Insert values.";
+			$script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)";
+			$script['save'][] = "\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t// ignore column";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// remove id";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('id' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update created";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('created_by' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update created";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('created' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\tcontinue;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// Make sure the alias is incremented";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('alias' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = \$this->getAlias(\$cell,\$table);";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// update version";
+			$script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$cell = 1;";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$version = true;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\t// set to insert array";
+			$script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$cell;";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$db->quote(\$cell);";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))";
+			$script['save'][] = "\t\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];";
+			$script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \"''\";";
+			$script['save'][] = "\t\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t// load the defaults";
+			$script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created_by';";
+			$script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$user->id);";
+			$script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created';";
+			$script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$todayDate);";
+			$script['save'][] = "\t\t\t\t\t\tif (!\$version)";
+			$script['save'][] = "\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\$columns[] \t= 'version';";
+			$script['save'][] = "\t\t\t\t\t\t\t\$values[] \t= 1;";
+			$script['save'][] = "\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t\t// Prepare the insert query.";
+			$script['save'][] = "\t\t\t\t\t\t\$query";
+			$script['save'][] = "\t\t\t\t\t\t\t->insert(\$db->quoteName('#__###-#-#-component###_'.\$table))";
+			$script['save'][] = "\t\t\t\t\t\t\t->columns(\$db->quoteName(\$columns))";
+			$script['save'][] = "\t\t\t\t\t\t\t->values(implode(',', \$values));";
+			$script['save'][] = "\t\t\t\t\t\t// Set the query using our newly populated query object and execute it.";
+			$script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);";
+			$script['save'][] = "\t\t\t\t\t\t\$done = \$db->execute();";
+			$script['save'][] = "\t\t\t\t\t\tif (\$done)";
+			$script['save'][] = "\t\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\t\t\$aId = \$db->insertid();";
+			$script['save'][] = "\t\t\t\t\t\t\t// make sure the access of asset is set";
+			$script['save'][] = "\t\t\t\t\t\t\t###-#-#-Component###Helper::setAsset(\$aId,\$table);";
+			$script['save'][] = "\t\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t\telse";
+			$script['save'][] = "\t\t\t\t\t{";
+			$script['save'][] = "\t\t\t\t\t\treturn false;";
+			$script['save'][] = "\t\t\t\t\t}";
+			$script['save'][] = "\t\t\t\t}";
+			$script['save'][] = "\t\t\t\treturn true;";
+			$script['save'][] = "\t\t\t}";
+			$script['save'][] = "\t\t}";
+			$script['save'][] = "\t\treturn false;";
+			$script['save'][] = "\t}";
+		}
+		elseif ('view' === $type)
+		{
+			$script['view'] = array();
+			$script['view'][] = "<script type=\"text/javascript\">";
+			$script['view'][] = "<?php if (\$this->hasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList)) : ?>";
+			$script['view'][] = "\tJoomla.continueImport = function()";
+			$script['view'][] = "\t{";
+			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
+			$script['view'][] = "\t\tvar error = false;";
+			$script['view'][] = "\t\tvar therequired = [<?php \$i = 0; foreach(\$this->headerList as \$name => \$title) { echo (\$i != 0)? ', \"vdm_'.\$name.'\"':'\"vdm_'.\$name.'\"'; \$i++; } ?>];";
+			$script['view'][] = "\t\tfor(i = 0; i < therequired.length; i++)";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\tif(jQuery('#'+therequired[i]).val() == \"\" )";
+			$script['view'][] = "\t\t\t{";
+			$script['view'][] = "\t\t\t\terror = true;";
+			$script['view'][] = "\t\t\t\tbreak;";
+			$script['view'][] = "\t\t\t}";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t\t// do field validation";
+			$script['view'][] = "\t\tif (error)";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>\");";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t\telse";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t\tform.gettype.value = 'continue';";
+			$script['view'][] = "\t\t\tform.submit();";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t};";
+			$script['view'][] = "<?php else: ?>";
+			$script['view'][] = "\tJoomla.submitbutton = function()";
+			$script['view'][] = "\t{";
+			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t// do field validation";
+			$script['view'][] = "\t\tif (form.import_package.value == \"\")";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>\");";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t\telse";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t\tform.gettype.value = 'upload';";
+			$script['view'][] = "\t\t\tform.submit();";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t};";
+			$script['view'][] = "";
+			$script['view'][] = "\n\tJoomla.submitbutton3 = function()";
+			$script['view'][] = "\t{";
+			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t// do field validation";
+			$script['view'][] = "\t\tif (form.import_directory.value == \"\"){";
+			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>\");";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t\telse";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t\tform.gettype.value = 'folder';";
+			$script['view'][] = "\t\t\tform.submit();";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t};";
+			$script['view'][] = "";
+			$script['view'][] = "\n\tJoomla.submitbutton4 = function()";
+			$script['view'][] = "\t{";
+			$script['view'][] = "\t\tvar form = document.getElementById('adminForm');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t// do field validation";
+			$script['view'][] = "\t\tif (form.import_url.value == \"\" || form.import_url.value == \"http://\")";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\talert(\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_MSG_ENTER_A_URL', true); ?>\");";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t\telse";
+			$script['view'][] = "\t\t{";
+			$script['view'][] = "\t\t\tjQuery('#loading').css('display', 'block');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t\tform.gettype.value = 'url';";
+			$script['view'][] = "\t\t\tform.submit();";
+			$script['view'][] = "\t\t}";
+			$script['view'][] = "\t};";
+			$script['view'][] = "<?php endif; ?>";
+			$script['view'][] = "";
+			$script['view'][] = "\n// Add spindle-wheel for importations:";
+			$script['view'][] = "jQuery(document).ready(function(\$) {";
+			$script['view'][] = "\tvar outerDiv = \$('body');";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\$('<div id=\"loading\"></div>')";
+			$script['view'][] = "\t\t.css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_###-#-#-component###/assets/images/import.gif') 50% 15% no-repeat\")";
+			$script['view'][] = "\t\t.css(\"top\", outerDiv.position().top - \$(window).scrollTop())";
+			$script['view'][] = "\t\t.css(\"left\", outerDiv.position().left - \$(window).scrollLeft())";
+			$script['view'][] = "\t\t.css(\"width\", outerDiv.width())";
+			$script['view'][] = "\t\t.css(\"height\", outerDiv.height())";
+			$script['view'][] = "\t\t.css(\"position\", \"fixed\")";
+			$script['view'][] = "\t\t.css(\"opacity\", \"0.80\")";
+			$script['view'][] = "\t\t.css(\"-ms-filter\", \"progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)\")";
+			$script['view'][] = "\t\t.css(\"filter\", \"alpha(opacity = 80)\")";
+			$script['view'][] = "\t\t.css(\"display\", \"none\")";
+			$script['view'][] = "\t\t.appendTo(outerDiv);";
+			$script['view'][] = "});";
+			$script['view'][] = "";
+			$script['view'][] = "\n</script>";
+			$script['view'][] = "";
+			$script['view'][] = "\n<div id=\"installer-import\" class=\"clearfix\">";
+			$script['view'][] = "<form enctype=\"multipart/form-data\" action=\"<?php echo JRoute::_('index.php?option=com_###-#-#-component###&view=import_###-#-#-views###');?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t<?php if (!empty( \$this->sidebar)) : ?>";
+			$script['view'][] = "\t\t<div id=\"j-sidebar-container\" class=\"span2\">";
+			$script['view'][] = "\t\t\t<?php echo \$this->sidebar; ?>";
+			$script['view'][] = "\t\t</div>";
+			$script['view'][] = "\t\t<div id=\"j-main-container\" class=\"span10\">";
+			$script['view'][] = "\t<?php else : ?>";
+			$script['view'][] = "\t\t<div id=\"j-main-container\">";
+			$script['view'][] = "\t<?php endif;?>";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t<?php if (\$this->hasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList) && ###-#-#-Component###Helper::checkArray(\$this->headers)) : ?>";
+			$script['view'][] = "\t\t<fieldset class=\"uploadform\">";
+			$script['view'][] = "\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>";
+			$script['view'][] = "\t\t\t<div class=\"control-group\">";
+			$script['view'][] = "\t\t\t\t<label class=\"control-label\" ><h4><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>";
+			$script['view'][] = "\t\t\t\t<div class=\"controls\">";
+			$script['view'][] = "\t\t\t\t\t<label class=\"control-label\" ><h4><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t</div>";
+			$script['view'][] = "\t\t\t<?php foreach(\$this->headerList as \$name => \$title): ?>";
+			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
+			$script['view'][] = "\t\t\t\t\t<label for=\"<?php echo \$name; ?>\" class=\"control-label\" ><?php echo \$title; ?></label>";
+			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
+			$script['view'][] = "\t\t\t\t\t\t<select  name=\"<?php echo \$name; ?>\"  id=\"vdm_<?php echo \$name; ?>\" required class=\"required input_box\" >";
+			$script['view'][] = "\t\t\t\t\t\t\t<option value=\"\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>";
+			$script['view'][] = "\t\t\t\t\t\t\t<option value=\"IGNORE\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>";
+			$script['view'][] = "\t\t\t\t\t\t\t<?php foreach(\$this->headers as \$value => \$option): ?>";
+			$script['view'][] = "\t\t\t\t\t\t\t\t<?php \$selected = (strtolower(\$option) ==  strtolower (\$title) || strtolower(\$option) == strtolower(\$name))? 'selected=\"selected\"':''; ?>";
+			$script['view'][] = "\t\t\t\t\t\t\t\t<option value=\"<?php echo ###-#-#-Component###Helper::htmlEscape(\$value); ?>\" class=\"required\" <?php echo \$selected ?>><?php echo ###-#-#-Component###Helper::htmlEscape(\$option); ?></option>";
+			$script['view'][] = "\t\t\t\t\t\t\t<?php endforeach; ?>";
+			$script['view'][] = "\t\t\t\t\t\t</select>";
+			$script['view'][] = "\t\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t<?php endforeach; ?>";
+			$script['view'][] = "\t\t\t<div class=\"form-actions\">";
+			$script['view'][] = "\t\t\t\t<input class=\"btn btn-primary\" type=\"button\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_CONTINUE'); ?>\" onclick=\"Joomla.continueImport()\" />";
+			$script['view'][] = "\t\t\t</div>";
+			$script['view'][] = "\t\t</fieldset>";
+			$script['view'][] = "\t\t<input type=\"hidden\" name=\"gettype\" value=\"continue\" />";
+			$script['view'][] = "\t<?php else: ?>";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>";
+			$script['view'][] = "\t\t";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>";
+			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
+			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
+			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
+			$script['view'][] = "\t\t\t\t\t<label for=\"import_package\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE'); ?></label>";
+			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
+			$script['view'][] = "\t\t\t\t\t\t<input class=\"input_box\" id=\"import_package\" name=\"import_package\" type=\"file\" size=\"57\" />";
+			$script['view'][] = "\t\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
+			$script['view'][] = "\t\t\t\t\t<input class=\"btn btn-primary\" type=\"button\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>\" onclick=\"Joomla.submitbutton()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t</fieldset>";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+			$script['view'][] = "\t\t";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>";
+			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
+			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
+			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
+			$script['view'][] = "\t\t\t\t\t<label for=\"import_directory\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>";
+			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
+			$script['view'][] = "\t\t\t\t\t\t<input type=\"text\" id=\"import_directory\" name=\"import_directory\" class=\"span5 input_box\" size=\"70\" value=\"<?php echo \$this->state->get('import.directory'); ?>\" />";
+			$script['view'][] = "\t\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
+			$script['view'][] = "\t\t\t\t\t<input type=\"button\" class=\"btn btn-primary\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_GET_BOTTON'); ?>\" onclick=\"Joomla.submitbutton3()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t</fieldset>";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+			$script['view'][] = "";
+			$script['view'][] = "\n\t\t<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FROM_URL', true)); ?>";
+			$script['view'][] = "\t\t\t<fieldset class=\"uploadform\">";
+			$script['view'][] = "\t\t\t\t<legend><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>";
+			$script['view'][] = "\t\t\t\t<div class=\"control-group\">";
+			$script['view'][] = "\t\t\t\t\t<label for=\"import_url\" class=\"control-label\"><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>";
+			$script['view'][] = "\t\t\t\t\t<div class=\"controls\">";
+			$script['view'][] = "\t\t\t\t\t\t<input type=\"text\" id=\"import_url\" name=\"import_url\" class=\"span5 input_box\" size=\"70\" value=\"http://\" />";
+			$script['view'][] = "\t\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t\t<div class=\"form-actions\">";
+			$script['view'][] = "\t\t\t\t\t<input type=\"button\" class=\"btn btn-primary\" value=\"<?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_GET_BOTTON'); ?>\" onclick=\"Joomla.submitbutton4()\" />&nbsp;&nbsp;&nbsp;<small><?php echo JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>";
+			$script['view'][] = "\t\t\t\t</div>";
+			$script['view'][] = "\t\t\t</fieldset>";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+			$script['view'][] = "\t\t<?php echo JHtml::_('bootstrap.endTabSet'); ?>";
+			$script['view'][] = "\t\t<input type=\"hidden\" name=\"gettype\" value=\"upload\" />";
+			$script['view'][] = "\t<?php endif; ?>";
+			$script['view'][] = "\t<input type=\"hidden\" name=\"task\" value=\"import_###-#-#-views###.import\" />";
+			$script['view'][] = "\t<?php echo JHtml::_('form.token'); ?>";
+			$script['view'][] = "</form>";
+			$script['view'][] = "</div>";
+		}
+		elseif ('import' === $type)
+		{
+			$script['import'] = array();
+			$script['import'][] = "\t/**";
+			$script['import'][] = "\t * Import an spreadsheet from either folder, url or upload.";
+			$script['import'][] = "\t *";
+			$script['import'][] = "\t * @return  boolean result of import";
+			$script['import'][] = "\t *";
+			$script['import'][] = "\t */";
+			$script['import'][] = "\tpublic function import()";
+			$script['import'][] = "\t{";
+			$script['import'][] = "\t\t\$this->setState('action', 'import');";
+			$script['import'][] = "\t\t\$app \t\t= JFactory::getApplication();";
+			$script['import'][] = "\t\t\$session \t= JFactory::getSession();";
+			$script['import'][] = "\t\t\$package \t= null;";
+			$script['import'][] = "\t\t\$continue\t= false;";
+			$script['import'][] = "\t\t// get import type";
+			$script['import'][] = "\t\t\$this->getType = \$app->input->getString('gettype', NULL);";
+			$script['import'][] = "\t\t// get import type";
+			$script['import'][] = "\t\t\$this->dataType\t= \$session->get('dataType_VDM_IMPORTINTO', NULL);";
+			$script['import'][] = "\n\t\tif (\$package === null)";
+			$script['import'][] = "\t\t{";
+			$script['import'][] = "\t\t\tswitch (\$this->getType)";
+			$script['import'][] = "\t\t\t{";
+			$script['import'][] = "\t\t\t\tcase 'folder':";
+			$script['import'][] = "\t\t\t\t\t// Remember the 'Import from Directory' path.";
+			$script['import'][] = "\t\t\t\t\t\$app->getUserStateFromRequest(\$this->_context . '.import_directory', 'import_directory');";
+			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromFolder();";
+			$script['import'][] = "\t\t\t\t\tbreak;";
+			$script['import'][] = "\n\t\t\t\tcase 'upload':";
+			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUpload();";
+			$script['import'][] = "\t\t\t\t\tbreak;";
+			$script['import'][] = "\n\t\t\t\tcase 'url':";
+			$script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUrl();";
+			$script['import'][] = "\t\t\t\t\tbreak;";
+			$script['import'][] = "\n\t\t\t\tcase 'continue':";
+			$script['import'][] = "\t\t\t\t\t\$continue \t= true;";
+			$script['import'][] = "\t\t\t\t\t\$package\t= \$session->get('package', null);";
+			$script['import'][] = "\t\t\t\t\t\$package\t= json_decode(\$package, true);";
+			$script['import'][] = "\t\t\t\t\t// clear session";
+			$script['import'][] = "\t\t\t\t\t\$session->clear('package');";
+			$script['import'][] = "\t\t\t\t\t\$session->clear('dataType');";
+			$script['import'][] = "\t\t\t\t\t\$session->clear('hasPackage');";
+			$script['import'][] = "\t\t\t\t\tbreak;";
+			$script['import'][] = "\n\t\t\t\tdefault:";
+			$script['import'][] = "\t\t\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));";
+			$script['import'][] = "\n\t\t\t\t\treturn false;";
+			$script['import'][] = "\t\t\t\t\tbreak;";
+			$script['import'][] = "\t\t\t}";
+			$script['import'][] = "\t\t}";
+			$script['import'][] = "\t\t// Was the package valid?";
+			$script['import'][] = "\t\tif (!\$package || !\$package['type'])";
+			$script['import'][] = "\t\t{";
+			$script['import'][] = "\t\t\tif (in_array(\$this->getType, array('upload', 'url')))";
+			$script['import'][] = "\t\t\t{";
+			$script['import'][] = "\t\t\t\t\$this->remove(\$package['packagename']);";
+			$script['import'][] = "\t\t\t}";
+			$script['import'][] = "\n\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));";
+			$script['import'][] = "\t\t\treturn false;";
+			$script['import'][] = "\t\t}";
+			$script['import'][] = "\t\t";
+			$script['import'][] = "\t\t// first link data to table headers";
+			$script['import'][] = "\t\tif(!\$continue){";
+			$script['import'][] = "\t\t\t\$package\t= json_encode(\$package);";
+			$script['import'][] = "\t\t\t\$session->set('package', \$package);";
+			$script['import'][] = "\t\t\t\$session->set('dataType', \$this->dataType);";
+			$script['import'][] = "\t\t\t\$session->set('hasPackage', true);";
+			$script['import'][] = "\t\t\treturn true;";
+			$script['import'][] = "\t\t}";
+			$script['import'][] = "\t\t// set the data";
+			$script['import'][] = "\t\t\$headerList = json_decode(\$session->get(\$this->dataType.'_VDM_IMPORTHEADERS', false), true);";
+			$script['import'][] = "\t\tif (!\$this->setData(\$package,\$this->dataType,\$headerList))";
+			$script['import'][] = "\t\t{";
+			$script['import'][] = "\t\t\t// There was an error importing the package";
+			$script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_ERROR');";
+			$script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);";
+			$script['import'][] = "\t\t\tif (\$back)";
+			$script['import'][] = "\t\t\t{";
+			$script['import'][] = "\t\t\t\t\$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);";
+			$script['import'][] = "\t\t\t\t\$session->clear('backto_VDM_IMPORT');";
+			$script['import'][] = "\t\t\t}";
+			$script['import'][] = "\t\t\t\$result = false;";
+			$script['import'][] = "\t\t}";
+			$script['import'][] = "\t\telse";
+			$script['import'][] = "\t\t{";
+			$script['import'][] = "\t\t\t// Package imported sucessfully";
+			$script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::sprintf('COM_###-#-#-COMPONENT###_IMPORT_SUCCESS', \$package['packagename']);";
+			$script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);";
+			$script['import'][] = "\t\t\tif (\$back)";
+			$script['import'][] = "\t\t\t{";
+			$script['import'][] = "\t\t\t    \$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);";
+			$script['import'][] = "\t\t\t    \$session->clear('backto_VDM_IMPORT');";
+			$script['import'][] = "\t\t\t}";
+			$script['import'][] = "\t\t\t\$result = true;";
+			$script['import'][] = "\t\t}";
+			$script['import'][] = "\n\t\t// Set some model state values";
+			$script['import'][] = "\t\t\$app->enqueueMessage(\$msg);";
+			$script['import'][] = "\n\t\t// remove file after import";
+			$script['import'][] = "\t\t\$this->remove(\$package['packagename']);";
+			$script['import'][] = "\t\t\$session->clear(\$this->getType.'_VDM_IMPORTHEADERS');";
+			$script['import'][] = "\t\treturn \$result;";
+			$script['import'][] = "\t}";
+		}
+		elseif ('ext' === $type)
+		{
+			$script['ext'][] = "\t/**";
+			$script['ext'][] = "\t * Check the extension";
+			$script['ext'][] = "\t *";
+			$script['ext'][] = "\t * @param   string  \$file    Name of the uploaded file";
+			$script['ext'][] = "\t *";
+			$script['ext'][] = "\t * @return  boolean  True on success";
+			$script['ext'][] = "\t *";
+			$script['ext'][] = "\t */";
+			$script['ext'][] = "\tprotected function checkExtention(\$file)";
+			$script['ext'][] = "\t{";
+			$script['ext'][] = "\t\t// check the extention";
+			$script['ext'][] = "\t\tswitch(strtolower(pathinfo(\$file, PATHINFO_EXTENSION)))";
+			$script['ext'][] = "\t\t{";
+			$script['ext'][] = "\t\t\tcase 'xls':";
+			$script['ext'][] = "\t\t\tcase 'ods':";
+			$script['ext'][] = "\t\t\tcase 'csv':";
+			$script['ext'][] = "\t\t\treturn true;";
+			$script['ext'][] = "\t\t\tbreak;";
+			$script['ext'][] = "\t\t}";
+			$script['ext'][] = "\t\treturn false;";
+			$script['ext'][] = "\t}";
+		}
+		// return the needed script
+		if (isset($script[$type]))
+		{
+			return str_replace('-#-#-', '', implode("\n",$script[$type]));
+		}
+		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.
 	**/
@@ -458,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');
@@ -798,13 +1659,18 @@ abstract class ComponentbuilderHelper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@@ -1343,6 +2209,20 @@ abstract class ComponentbuilderHelper
 		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
+			// create file name without the extention that is safe
+			if ($type === 'filename')
+			{
+				// make sure VDM is not in the string
+				$string = str_replace('VDM', 'vDm', $string);
+				// Remove anything which isn't a word, whitespace, number
+				// or any of the following caracters -_()
+				// 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);
+				// http://stackoverflow.com/a/2021729/1429677
+				return preg_replace('/\s+/', ' ', $string);
+			}
 			// remove all other characters
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);

admin/helpers/headercheck.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -517,6 +517,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY="Php Import Display"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION="Add your PHP here!"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT="// The display method for the view.html.php file."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL="PHP (display)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT="Php Import Ext"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT="// PHP here for the checkExtension Method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL="Check Extension Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
@@ -691,10 +695,39 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_YOUTUBE="Youtube"
 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"
 COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading"
 COM_COMPONENTBUILDER_BACK="Back"
+COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First"
+COM_COMPONENTBUILDER_BADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Admin view in %s</b> has id mismatch of selected <b>admin view</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BASIC_METHOD="Basic Method"
+COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED="<b>Component in %s</b> has id mismatch of selected <b>component</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BCONFIG_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="<b>Config in %s</b> has id mismatch of selected <b>field</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BCUSTOM_ADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCUSTOM_ADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Custom admin view in %s</b> has id mismatch of selected <b>custom admin view</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="<b>Custom files</b> not move to correct location!"
+COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED="<b>Custom get in %s</b> has id mismatch of selected <b>dynamic get</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="<b>Dynamic get</b> id:%s mismatch in <b>%s</b>."
+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_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"
 COM_COMPONENTBUILDER_COMPILER="Compiler"
@@ -732,6 +765,7 @@ COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_ONE="Every five hours"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_SIX="Never"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_THREE="Once a day"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_TWO="Every twelve hours"
+COM_COMPONENTBUILDER_CONFIG_COMPANY="Company"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION="Here you can set the path to the compiler folder"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_HINT="/home/user/compiler"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL="Compiler Folder Path"
@@ -760,6 +794,27 @@ 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_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_COMPANY_DESCRIPTION="Enter Company Name Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_HINT="Company Name Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL="Company Name"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_DESCRIPTION="Add Copyright Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_HINT="Add Copyright Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_LABEL="Copyright"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION="Enter Email"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT="Email Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL="Email"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION="Add License Here"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT="Add License Here"
+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_WEBSITE_DESCRIPTION="Enter website address"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT="http://www.example.com"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
@@ -781,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"
@@ -791,6 +848,7 @@ COM_COMPONENTBUILDER_CONFIG_UIKIT_MIN_LABEL="Load Minified"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_STYLE_DESC="Set the css style that should be used."
 COM_COMPONENTBUILDER_CONFIG_UIKIT_STYLE_LABEL="css Style"
 COM_COMPONENTBUILDER_CONFIG_YES="Yes"
+COM_COMPONENTBUILDER_CONFIRMATION_STEP_BEFORE_IMPORTING="Confirmation Step Before Importing!"
 COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
 COM_COMPONENTBUILDER_COPYRIGHT="Copyright"
@@ -1273,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>
@@ -1375,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"
@@ -1416,15 +1474,16 @@ COM_COMPONENTBUILDER_DASHBOARD_CUSTOM_CODES="Custom Codes<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_DYNAMIC_GETS="Dynamic Gets<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_DYNAMIC_GET_ADD="Add&nbsp;Dynamic Get<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDS="Fields<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_FIELDS_CATID="Catagory &nbsp;For<br />Fields"
+COM_COMPONENTBUILDER_DASHBOARD_FIELDS_CATID="Category &nbsp;For<br />Fields"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES="Fieldtypes<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Catagory &nbsp;For<br />Fieldtypes"
+COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Category &nbsp;For<br />Fieldtypes"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPE_ADD="Add&nbsp;Fieldtype<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELD_ADD="Add&nbsp;Field<br /><br />"
 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 />"
@@ -1435,6 +1494,7 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
 COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
+COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
@@ -1741,9 +1801,20 @@ COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EMAIL="Email"
+COM_COMPONENTBUILDER_EMAUTHOREM_BSB="<em>Author</em>: <b>%s</b>"
+COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="<em>Company:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMCOMPANY_NAMEEM_BSB="<em>Company Name</em>: <b>%s</b>"
+COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB="<em>Copyright:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMEMAILEM_BSB="<em>Email:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMLICENSEEM_BSB="<em>License:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMOWNEREM_BSB="<em>Owner:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="<em>Website:</em> <b>%s</b>"
+COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!"
+COM_COMPONENTBUILDER_EXPORT_COMPONENTS="Export Components"
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
 COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
 COM_COMPONENTBUILDER_EXPORT_FAILED="Export Failed"
+COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER="Export failed, please try again latter!"
 COM_COMPONENTBUILDER_FIELD="Field"
 COM_COMPONENTBUILDER_FIELDS="Fields"
 COM_COMPONENTBUILDER_FIELDS_ACCESS="Fields Access"
@@ -2037,6 +2108,8 @@ COM_COMPONENTBUILDER_FIELD_XML_HINT="Field XML Go Here"
 COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field details here to fit your needs)"
 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"
@@ -2149,6 +2222,9 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_DESC="A count of the number of times
 COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_HELP_MANAGER="Help"
 COM_COMPONENTBUILDER_HI="Hi"
+COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_BROKEN_PACKAGE="<h2>Data is corrupt!</h2>This could be due to broken package!"
+COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_KEY_ERROR_OR_BROKEN_PACKAGE="<h2>Data is corrupt!</h2>This could be due to key error, or broken package!"
+COM_COMPONENTBUILDER_IMPORT_COMPONENTS="Import Components"
 COM_COMPONENTBUILDER_IMPORT_CONTINUE="Continue"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
 COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
@@ -2175,6 +2251,7 @@ COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTFILE="Warning, import file error."
 COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTUPLOADERROR="Warning, import upload error."
 COM_COMPONENTBUILDER_IMPORT_NO_IMPORT_TYPE_FOUND="Import type not found."
 COM_COMPONENTBUILDER_IMPORT_PLEASE_SELECT_COLUMN="-- Please Select Column --"
+COM_COMPONENTBUILDER_IMPORT_S="Import %s"
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE="Select File"
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_DIRECTORY="Set the path to file"
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_ADMIN_VIEWS="Select the file to import data to admin_views."
@@ -2185,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."
@@ -2313,7 +2392,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT="Add Site Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT_LABEL="Add Global Site Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL="Add Sql"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_DESCRIPTION="if set in view"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL="Add MySQL"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL="Add MySQL (to view table)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_OPTIONS_DESCRIPTION="if being added"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_OPTIONS_LABEL="Options"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER="Add Update Server"
@@ -2477,6 +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 you JCB package keys 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"
@@ -2539,8 +2632,12 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE="Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGES="Images"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (product box) for the dashboard and install page, must be 300px X 300px."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS="Joomla Component Import Components Button Access"
+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"
@@ -2845,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"
@@ -2910,6 +3008,155 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZOOM_OUT="Zoom Out"
 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"
@@ -3016,16 +3263,22 @@ COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LICENSE="License"
 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"
+COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details"
+COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND="Package owner details not found!"
+COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET="Package Owner Not Set"
+COM_COMPONENTBUILDER_PATH_TO_THE_ZIPPED_PACKAGE_IS_CODESCODE_BR_S_S="Path to the zipped package is: <code>%s</code> <br />%s %s"
 COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S="Please add files to (%s)"
 COM_COMPONENTBUILDER_PLEASE_ADD_FOLDERS_TO_S="Please add folders to (%s)"
 COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
 COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE="Please select a component that you would like to compile."
 COM_COMPONENTBUILDER_PLEASE_WAIT_CLEARING_THE_TMP_FOLDER="Please wait! Clearing the tmp folder"
-COM_COMPONENTBUILDER_PLEASE_WAIT_COMPILING_THE_COMPONENT="Please wait! Compiling the component"
-COM_COMPONENTBUILDER_READY_TO_COMPILE_YOUR_COMPONENT="Ready to compile your component"
+COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT="Ready to compile a component"
 COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github"
 COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
@@ -3034,6 +3287,8 @@ COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to co
 COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
 COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER="Should the component be moved to your local git folder?"
 COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
+COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported."
+COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during <b>import process</b> before adding the key, this way if the user/dev <b>does not</b> have the key they can see <b>where to get it</b>."
 COM_COMPONENTBUILDER_SITE_VIEW="Site View"
 COM_COMPONENTBUILDER_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
@@ -3318,6 +3573,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_NO="No"
 COM_COMPONENTBUILDER_SITE_VIEW_NONE="None"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language String"
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION="Use this placeholder in the body <code>[[[SITE_TOOLBAR]]]</code> to add the custom position of the toolbar."
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION="Notification"
@@ -3467,6 +3723,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_YES="Yes"
 COM_COMPONENTBUILDER_SITE_VIEW_YOUTUBE="Youtube"
 COM_COMPONENTBUILDER_SITE_VIEW_ZOOM_IN="Zoom In"
 COM_COMPONENTBUILDER_SITE_VIEW_ZOOM_OUT="Zoom Out"
+COM_COMPONENTBUILDER_SMART_PACKAGE_OPTIONS="Smart Package Options"
 COM_COMPONENTBUILDER_SNIPPET="Snippet"
 COM_COMPONENTBUILDER_SNIPPETS="Snippets"
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS="Snippets Access"
@@ -3577,10 +3834,14 @@ 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"
 COM_COMPONENTBUILDER_SUBMENU_TEMPLATES="Templates"
+COM_COMPONENTBUILDER_S_BEING_IMPORTED="%s Being Imported"
+COM_COMPONENTBUILDER_S_PLEASE_WAIT_THE_COMPONENT_IS_BEING_COMPILED="%s, please wait! The component is being compiled"
 COM_COMPONENTBUILDER_TEMPLATE="Template"
 COM_COMPONENTBUILDER_TEMPLATES="Templates"
 COM_COMPONENTBUILDER_TEMPLATES_ACCESS="Templates Access"
@@ -3684,14 +3945,30 @@ COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL="Template"
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC="A count of the number of times this Template has been revised."
 COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_TEMPLATE_YES="Yes"
+COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB="That means anyone who has this package can install it into JCB. To add an export key simply open the component, go to the tab called <b>settings</b>, bottom right there is a field called <b>Export Key</b>."
+COM_COMPONENTBUILDER_THE_KEY_OF_THIS_PACKAGE="The key of this package."
 COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
+COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: <code>%s</code>"
 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"
+COM_COMPONENTBUILDER_VDM_NOTICE_BOARD="VDM Notice Board"
 COM_COMPONENTBUILDER_VERSION="Version"
 COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
 COM_COMPONENTBUILDER_WEBSITE="Website"
 COM_COMPONENTBUILDER_YES="Yes"
+COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEYBR_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY="Your data is encrypted with a AES 128 bit encryption using the above 32 character key.<br />Without this key it will take the current technology with a brute force attack method more then <a href="http://random-ize.com/how-long-to-hack-pass/" target="_blank" title="How long to hack pass">700 000 000 000 000 000 000 000 000 000 000</a> years to crack theoretically."
+COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL="You can now select the component <b>zip</b> package you would like to import.<br /><small>Please note that smart component import only works with the following format: <b>(.zip)</b></small>"
+COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!"
+COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS="You should add the correct owner details."
+COM_COMPONENTBUILDER_YOU_SHOULD_ONLY_CONTINUE_THIS_IMPORT_IF_YOU_HAVE_BACKUP_YOUR_COMPONENTS_AND_INSURED_THAT_THE_PACKAGE_OWNER_IS_REPUTABLE="You should only continue this import if you have backup your components, and insured that the package owner is reputable."
 COM_COMPONENTBUILDER__SELECT_COMPONENT_="- Select Component -"
+COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S=", since you don't have permission to create %s!"
+COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S=", since you don't have permission to edit %s!"

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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
@@ -37,7 +37,8 @@ $fields = $displayData->get('fields') ?: array(
 	'html_import_view',
 	'php_import',
 	'php_import_setdata',
-	'php_import_save'
+	'php_import_save',
+	'php_import_ext'
 );
 
 ?>

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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->vxtfields;
+$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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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->vxulinked_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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 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.6
-	@build			1st March, 2017
+	@version		2.4.5
+	@build			4th May, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php