Updated with JCB v2.9.14

README.md

@@ -1,4 +1,4 @@
-# Support Groups (1.0.8)
+# Support Groups (1.0.10)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Support Groups](http://www.vdm.io)
 + *First Build*: 24th February, 2016
-+ *Last Build*: 5th May, 2018
++ *Last Build*: 4th April, 2019
-+ *Version*: 1.0.8
++ *Version*: 1.0.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 # Component Number
 
-+ *Line count*: **66093**
++ *Line count*: **66697**
-+ *File count*: **492**
++ *File count*: **494**
 + *Folder count*: **98**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -1,4 +1,4 @@
-# Support Groups (1.0.8)
+# Support Groups (1.0.10)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Support Groups](http://www.vdm.io)
 + *First Build*: 24th February, 2016
-+ *Last Build*: 5th May, 2018
++ *Last Build*: 4th April, 2019
-+ *Version*: 1.0.8
++ *Version*: 1.0.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 # Component Number
 
-+ *Line count*: **66093**
++ *Line count*: **66697**
-+ *File count*: **492**
++ *File count*: **494**
 + *Folder count*: **98**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/access.xml

@@ -70,17 +70,35 @@
 		<action name="area.import" title="COM_SUPPORTGROUPS_AREAS_IMPORT" description="COM_SUPPORTGROUPS_AREAS_IMPORT_DESC" />
 		<action name="area.submenu" title="COM_SUPPORTGROUPS_AREAS_SUBMENU" description="COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC" />
 		<action name="country.access" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC" />
+		<action name="country.access.alias" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC" />
+		<action name="country.access.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC" />
+		<action name="country.access.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC" />
+		<action name="country.access.currency" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC" />
+		<action name="country.access.name" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC" />
+		<action name="country.access.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC" />
 		<action name="country.batch" title="COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE" description="COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE_DESC" />
 		<action name="country.create" title="COM_SUPPORTGROUPS_COUNTRIES_CREATE" description="COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC" />
 		<action name="country.dashboard_list" title="COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST" description="COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC" />
 		<action name="country.delete" title="COM_SUPPORTGROUPS_COUNTRIES_DELETE" description="COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC" />
 		<action name="country.edit" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_DESC" />
+		<action name="country.edit.alias" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC" />
+		<action name="country.edit.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC" />
+		<action name="country.edit.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC" />
+		<action name="country.edit.currency" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC" />
+		<action name="country.edit.name" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC" />
 		<action name="country.edit.own" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN_DESC" />
 		<action name="country.edit.state" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE_DESC" />
 		<action name="country.version" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC" />
+		<action name="country.edit.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC" />
 		<action name="country.export" title="COM_SUPPORTGROUPS_COUNTRIES_EXPORT" description="COM_SUPPORTGROUPS_COUNTRIES_EXPORT_DESC" />
 		<action name="country.import" title="COM_SUPPORTGROUPS_COUNTRIES_IMPORT" description="COM_SUPPORTGROUPS_COUNTRIES_IMPORT_DESC" />
 		<action name="country.submenu" title="COM_SUPPORTGROUPS_COUNTRIES_SUBMENU" description="COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC" />
+		<action name="country.view.alias" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC" />
+		<action name="country.view.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC" />
+		<action name="country.view.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC" />
+		<action name="country.view.currency" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC" />
+		<action name="country.view.name" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC" />
+		<action name="country.view.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC" />
 		<action name="currency.access" title="COM_SUPPORTGROUPS_CURRENCIES_ACCESS" description="COM_SUPPORTGROUPS_CURRENCIES_ACCESS_DESC" />
 		<action name="currency.batch" title="COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE" description="COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE_DESC" />
 		<action name="currency.create" title="COM_SUPPORTGROUPS_CURRENCIES_CREATE" description="COM_SUPPORTGROUPS_CURRENCIES_CREATE_DESC" />
@@ -174,6 +192,9 @@
 		<action name="payment.import" title="COM_SUPPORTGROUPS_PAYMENTS_IMPORT" description="COM_SUPPORTGROUPS_PAYMENTS_IMPORT_DESC" />
 		<action name="payment.submenu" title="COM_SUPPORTGROUPS_PAYMENTS_SUBMENU" description="COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC" />
 		<action name="region.access" title="COM_SUPPORTGROUPS_REGIONS_ACCESS" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC" />
+		<action name="region.access.alias" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC" />
+		<action name="region.access.country" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC" />
+		<action name="region.access.name" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC" />
 		<action name="region.batch" title="COM_SUPPORTGROUPS_REGIONS_BATCH_USE" description="COM_SUPPORTGROUPS_REGIONS_BATCH_USE_DESC" />
 		<action name="region.create" title="COM_SUPPORTGROUPS_REGIONS_CREATE" description="COM_SUPPORTGROUPS_REGIONS_CREATE_DESC" />
 		<action name="region.dashboard_add" title="COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD" description="COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC" />
@@ -191,6 +212,9 @@
 		<action name="region.export" title="COM_SUPPORTGROUPS_REGIONS_EXPORT" description="COM_SUPPORTGROUPS_REGIONS_EXPORT_DESC" />
 		<action name="region.import" title="COM_SUPPORTGROUPS_REGIONS_IMPORT" description="COM_SUPPORTGROUPS_REGIONS_IMPORT_DESC" />
 		<action name="region.submenu" title="COM_SUPPORTGROUPS_REGIONS_SUBMENU" description="COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC" />
+		<action name="region.view.alias" title="COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS" description="COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC" />
+		<action name="region.view.country" title="COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY" description="COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC" />
+		<action name="region.view.name" title="COM_SUPPORTGROUPS_REGIONS_VIEW_NAME" description="COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC" />
 		<action name="support_group.smart_export" title="COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS" description="COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS_DESC" />
 		<action name="support_group.access" title="COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS" description="COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_DESC" />
 		<action name="site.supportgroups.access" title="COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_SITE" description="COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_SITE_DESC" />
@@ -356,8 +380,14 @@
 		<action name="region.delete" title="COM_SUPPORTGROUPS_REGIONS_DELETE" description="COM_SUPPORTGROUPS_REGIONS_DELETE_DESC" />
 		<action name="region.access" title="COM_SUPPORTGROUPS_REGIONS_ACCESS" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC" />
 		<action name="region.edit.name" title="COM_SUPPORTGROUPS_REGIONS_EDIT_NAME" description="COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC" />
+		<action name="region.access.name" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC" />
+		<action name="region.view.name" title="COM_SUPPORTGROUPS_REGIONS_VIEW_NAME" description="COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC" />
 		<action name="region.edit.country" title="COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY" description="COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC" />
+		<action name="region.access.country" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC" />
+		<action name="region.view.country" title="COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY" description="COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC" />
 		<action name="region.edit.alias" title="COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS" description="COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC" />
+		<action name="region.access.alias" title="COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS" description="COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC" />
+		<action name="region.view.alias" title="COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS" description="COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC" />
 		<action name="region.version" title="COM_SUPPORTGROUPS_REGIONS_EDIT_VERSION" description="COM_SUPPORTGROUPS_REGIONS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="country">
@@ -367,6 +397,24 @@
 		<action name="country.create" title="COM_SUPPORTGROUPS_COUNTRIES_CREATE" description="COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC" />
 		<action name="country.delete" title="COM_SUPPORTGROUPS_COUNTRIES_DELETE" description="COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC" />
 		<action name="country.access" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC" />
+		<action name="country.edit.name" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC" />
+		<action name="country.access.name" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC" />
+		<action name="country.view.name" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC" />
+		<action name="country.edit.currency" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC" />
+		<action name="country.access.currency" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC" />
+		<action name="country.view.currency" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC" />
+		<action name="country.edit.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC" />
+		<action name="country.access.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC" />
+		<action name="country.view.worldzone" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC" />
+		<action name="country.edit.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC" />
+		<action name="country.access.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC" />
+		<action name="country.view.codethree" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC" />
+		<action name="country.edit.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC" />
+		<action name="country.access.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC" />
+		<action name="country.view.codetwo" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC" />
+		<action name="country.edit.alias" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC" />
+		<action name="country.access.alias" title="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC" />
+		<action name="country.view.alias" title="COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS" description="COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC" />
 		<action name="country.version" title="COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION" description="COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC" />
 	</section>
 	<section name="currency">

admin/assets/css/additional_info.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		9th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		additional_info.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/additional_information.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		9th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		additional_information.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/admin.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		admin.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/area.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 32 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/area_type.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@first version of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area_type.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/area_types.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@first version of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area_types.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/areas.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 32 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		areas.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/countries.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 4 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		5th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		countries.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/country.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 4 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		5th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		country.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/currencies.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		8th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		currencies.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/currency.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		8th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		currency.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/dashboard.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		dashboard.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/facilities.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 13 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facilities.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/facility.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 13 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/facility_type.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 2 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		1st April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility_type.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/facility_types.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 2 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		1st April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility_types.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/help_document.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		1.0.10
-	@build			13th April, 2018
+	@build			4th April, 2019
-	@created		13th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		help_document.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/help_documents.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		1.0.10
-	@build			13th April, 2018
+	@build			4th April, 2019
-	@created		13th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		help_documents.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/info_type.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 3 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		info_type.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/info_types.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 3 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		info_types.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/payment.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 5 of this MVC
+	@version		1.0.10
-	@build			27th April, 2016
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		payment.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/payments.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 5 of this MVC
+	@version		1.0.10
-	@build			27th April, 2016
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		payments.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/region.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		15th May, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		region.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/regions.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		15th May, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		regions.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/support_group.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_group.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/css/support_groups.css

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_groups.css
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* CSS Document */

admin/assets/js/admin.js

@@ -5,21 +5,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		admin.js
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 /* JS Document */

admin/config.xml

@@ -183,6 +183,7 @@
 			label="COM_SUPPORTGROUPS_CONFIG_API_KEY_LABEL"
 			size="60"
 			maxlength="150"
+			default=""
 			description="COM_SUPPORTGROUPS_CONFIG_API_KEY_DESCRIPTION"
 			class="text_area"
 			filter="STRING"

admin/controller.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		controller.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * General Controller of Supportgroups component
  */

admin/controllers/additional_info.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		9th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		additional_info.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Additional_info Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Additional_information'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups');
+		$access = $user->authorise('additional_info.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('additional_info.create', $this->option);
+		return $user->authorise('additional_info.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerAdditional_info extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/additional_information.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		9th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		additional_information.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Additional_information Controller
  */
 class SupportgroupsControllerAdditional_information extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Additional_info', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Additional_info', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerAdditional_information extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=additional_information', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/ajax.json.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		ajax.json.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Supportgroups Ajax Controller
  */

admin/controllers/area.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 32 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Area Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerArea extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Areas'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerArea extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('area.access', 'com_supportgroups');
+		$access = $user->authorise('area.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('area.create', $this->option);
+		return $user->authorise('area.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerArea extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerArea extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerArea extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerArea extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerArea extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerArea extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/area_type.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@first version of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area_type.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Area_type Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Area_types'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('area_type.access', 'com_supportgroups');
+		$access = $user->authorise('area_type.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('area_type.create', $this->option);
+		return $user->authorise('area_type.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerArea_type extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerArea_type extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerArea_type extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/area_types.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@first version of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		area_types.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Area_types Controller
  */
 class SupportgroupsControllerArea_types extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_AREA_TYPES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Area_type', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_AREA_TYPES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Area_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerArea_types extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=area_types', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/areas.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 32 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		areas.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Areas Controller
  */
 class SupportgroupsControllerAreas extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_AREAS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Area', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_AREAS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Area', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerAreas extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=areas', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/countries.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 4 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		5th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		countries.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Countries Controller
  */
 class SupportgroupsControllerCountries extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_COUNTRIES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Country', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_COUNTRIES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Country', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerCountries extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=countries', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/country.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 4 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		5th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		country.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Country Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerCountry extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Countries'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerCountry extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('country.access', 'com_supportgroups');
+		$access = $user->authorise('country.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('country.create', $this->option);
+		return $user->authorise('country.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerCountry extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerCountry extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerCountry extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerCountry extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerCountry extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerCountry extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/currencies.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		8th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		currencies.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Currencies Controller
  */
 class SupportgroupsControllerCurrencies extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_CURRENCIES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Currency', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_CURRENCIES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Currency', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerCurrencies extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=currencies', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/currency.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		8th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		currency.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Currency Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Currencies'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('currency.access', 'com_supportgroups');
+		$access = $user->authorise('currency.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('currency.create', $this->option);
+		return $user->authorise('currency.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerCurrency extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerCurrency extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerCurrency extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/facilities.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 13 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facilities.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Facilities Controller
  */
 class SupportgroupsControllerFacilities extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITIES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Facility', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITIES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Facility', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerFacilities extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=facilities', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/facility.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 13 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Facility Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerFacility extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Facilities'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerFacility extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('facility.access', 'com_supportgroups');
+		$access = $user->authorise('facility.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('facility.create', $this->option);
+		return $user->authorise('facility.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerFacility extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerFacility extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerFacility extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerFacility extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerFacility extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerFacility extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/facility_type.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 2 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		1st April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility_type.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Facility_type Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Facility_types'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups');
+		$access = $user->authorise('facility_type.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('facility_type.create', $this->option);
+		return $user->authorise('facility_type.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerFacility_type extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/facility_types.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 2 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		1st April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		facility_types.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Facility_types Controller
  */
 class SupportgroupsControllerFacility_types extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITY_TYPES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Facility_type', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITY_TYPES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Facility_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerFacility_types extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=facility_types', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/help.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		help.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Supportgroups Help Controller
  */

admin/controllers/help_document.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		1.0.10
-	@build			13th April, 2018
+	@build			4th April, 2019
-	@created		13th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		help_document.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Help_document Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('help_document.access', 'com_supportgroups');
+		$access = $user->authorise('help_document.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('help_document.create', $this->option);
+		return $user->authorise('help_document.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerHelp_document extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/help_documents.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		1.0.10
-	@build			13th April, 2018
+	@build			4th April, 2019
-	@created		13th July, 2015
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		help_documents.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Help_documents Controller
  */
 class SupportgroupsControllerHelp_documents extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_HELP_DOCUMENTS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Help_document', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_HELP_DOCUMENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Help_document', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerHelp_documents extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=help_documents', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/import.php

@@ -6,21 +6,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		import.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file

admin/controllers/info_type.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 3 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		info_type.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Info_type Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Info_types'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('info_type.access', 'com_supportgroups');
+		$access = $user->authorise('info_type.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('info_type.create', $this->option);
+		return $user->authorise('info_type.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerInfo_type extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/info_types.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 3 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		2nd April, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		info_types.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Info_types Controller
  */
 class SupportgroupsControllerInfo_types extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_INFO_TYPES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Info_type', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_INFO_TYPES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Info_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerInfo_types extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=info_types', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/payment.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 5 of this MVC
+	@version		1.0.10
-	@build			27th April, 2016
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		payment.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Payment Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerPayment extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Payments'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerPayment extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('payment.access', 'com_supportgroups');
+		$access = $user->authorise('payment.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('payment.create', $this->option);
+		return $user->authorise('payment.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerPayment extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerPayment extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerPayment extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerPayment extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerPayment extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerPayment extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/payments.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 5 of this MVC
+	@version		1.0.10
-	@build			27th April, 2016
+	@build			4th April, 2019
-	@created		6th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		payments.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Payments Controller
  */
 class SupportgroupsControllerPayments extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_PAYMENTS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Payment', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_PAYMENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Payment', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerPayments extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=payments', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/region.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		15th May, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		region.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Region Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerRegion extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Regions'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerRegion extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('region.access', 'com_supportgroups');
+		$access = $user->authorise('region.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('region.create', $this->option);
+		return $user->authorise('region.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerRegion extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerRegion extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerRegion extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerRegion extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerRegion extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerRegion extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/regions.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		15th May, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		regions.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Regions Controller
  */
 class SupportgroupsControllerRegions extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_REGIONS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Region', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_REGIONS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Region', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,5 +116,5 @@ class SupportgroupsControllerRegions extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=regions', false), $message, 'error');
 		return;
-	}  
+	}
 }

admin/controllers/support_group.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_group.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Support_group Controller
  */
@@ -43,6 +40,13 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Support_groups'; // safeguard for setting the return view listing to the main view.
@@ -60,14 +64,17 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('support_group.access', 'com_supportgroups');
+		$access = $user->authorise('support_group.access', 'com_supportgroups');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('support_group.create', $this->option);
+		return $user->authorise('support_group.create', $this->option);
 	}
 
 	/**
@@ -83,9 +90,9 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	protected function allowEdit($data = array(), $key = 'id')
 	{
 		// get user object.
-		$user		= JFactory::getUser();
+		$user = JFactory::getUser();
 		// get record id.
-		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 
 
 		// Access check.
@@ -141,42 +148,25 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -215,43 +205,45 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$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
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$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
 				)
 			);
 		}
@@ -270,11 +262,15 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -282,9 +278,22 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -293,9 +302,9 @@ class SupportgroupsControllerSupport_group extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/support_groups.php

@@ -6,44 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		1.0.10
-	@build			25th October, 2017
+	@build			4th April, 2019
-	@created		4th March, 2016
+	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_groups.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Support_groups Controller
  */
 class SupportgroupsControllerSupport_groups extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SUPPORTGROUPS_SUPPORT_GROUPS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Support_group', $prefix = 'SupportgroupsModel', $config = array())
+	protected $text_prefix = 'COM_SUPPORTGROUPS_SUPPORT_GROUPS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Support_group', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()
@@ -107,7 +116,7 @@ class SupportgroupsControllerSupport_groups extends JControllerAdmin
 		$message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=support_groups', false), $message, 'error');
 		return;
-	}  
+	}
 
 	public function smartExport()
 	{

admin/controllers/supportgroups.php

@@ -6,29 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		supportgroups.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Supportgroups Controller
  */

admin/helpers/headercheck.php

@@ -6,21 +6,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		headercheck.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file

admin/helpers/html/batch_.php

@@ -6,21 +6,21 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		batch_.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file

admin/helpers/negativefinder.php

@@ -14,54 +14,54 @@ defined('_JEXEC') or die;
 *	Detecting negative numbers
 **/
 
-class Expression
+class SupportgroupsExpression
 {
-    protected $expression;
+	protected $expression;
-    protected $result;
+	protected $result;
 
-    public function __construct($expression)
+	public function __construct($expression)
 	{
-        $this->expression = $expression;
+		$this->expression = $expression;
-    }
+	}
 
-    public function evaluate()
+	public function evaluate()
 	{
-        $this->result = eval("return ".$this->expression.";");
+		$this->result = eval("return ".$this->expression.";");
-        return $this;
+		return $this;
-    }
+	}
 
-    public function getResult()
+	public function getResult()
 	{
-        return $this->result;
+		return $this->result;
-    }
+	}
 }
 
-class NegativeFinder
+class SupportgroupsNegativeFinder
 {
-    protected $expressionObj;
+	protected $expressionObj;
 
-    public function __construct(Expression $expressionObj)
+	public function __construct(SupportgroupsExpression $expressionObj)
 	{
-        $this->expressionObj = $expressionObj;
+		$this->expressionObj = $expressionObj;
-    }
+	}
 
 
-    public function isItNegative()
+	public function isItNegative()
 	{
-        $result = $this->expressionObj->evaluate()->getResult();
+		$result = $this->expressionObj->evaluate()->getResult();
-
+		
-        if($this->hasMinusSign($result))
+		if($this->hasMinusSign($result))
 		{
-            return true;
+			return true;
-        }
+		}
 		else
 		{
-            return false;
+			return false;
-        }
+		}
-    }
+	}
 
-    protected function hasMinusSign($value) 
+	protected function hasMinusSign($value) 
 	{
-        return (substr(strval($value), 0, 1) == "-");
+		return (substr(strval($value), 0, 1) == "-");
-    }
+	}
 }

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

@@ -10,25 +10,25 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_BATCH_USE_DESC="Allows users in this gr
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE="Additional Information Create"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE_DESC="Allows the users in this group to create create additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD="Additional Information Dashboard Add"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST="Additional Information Dashboard List"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE="Additional Information Delete"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE_DESC="Allows the users in this group to delete delete additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT="Additional Information Edit"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS="Additional Information Edit Alias"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY="Additional Information Edit Created By"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE="Additional Information Edit Created Date"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DESC="Allows the users in this group to edit the additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS="Additional Information Edit Details"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to edit details of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE="Additional Information Edit Info Type"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to update the edit info type of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to edit info type of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME="Additional Information Edit Name"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to edit name of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN="Additional Information Edit Own"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN_DESC="Allows the users in this group to edit edit own additional information created by them"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_STATE="Additional Information Edit State"
@@ -57,7 +57,7 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNFEATURED_1="%s Additional Inf
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNPUBLISHED="%s Additional Information unpublished."
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNPUBLISHED_1="%s Additional Info unpublished."
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU="Additional Information Submenu"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to update the submenu of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to submenu of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS="Alias"
 COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS_HINT="Auto-generated from name"
 COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS_LABEL="Alias"
@@ -105,31 +105,31 @@ COM_SUPPORTGROUPS_AREAS_BATCH_USE_DESC="Allows users in this group to use batch
 COM_SUPPORTGROUPS_AREAS_CREATE="Areas Create"
 COM_SUPPORTGROUPS_AREAS_CREATE_DESC="Allows the users in this group to create create areas"
 COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD="Areas Dashboard Add"
-COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the area"
+COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of area"
 COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST="Areas Dashboard List"
-COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the area"
+COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of area"
 COM_SUPPORTGROUPS_AREAS_DELETE="Areas Delete"
 COM_SUPPORTGROUPS_AREAS_DELETE_DESC="Allows the users in this group to delete delete areas"
 COM_SUPPORTGROUPS_AREAS_EDIT="Areas Edit"
 COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS="Areas Edit Alias"
-COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE="Areas Edit Area Type"
-COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to update the edit area type of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to edit area type of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_COLOR="Areas Edit Color"
-COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to update the edit color of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to edit color of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY="Areas Edit Created By"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by areas"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE="Areas Edit Created Date"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created areas"
 COM_SUPPORTGROUPS_AREAS_EDIT_DESC="Allows the users in this group to edit the area"
 COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS="Areas Edit Details"
-COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_NAME="Areas Edit Name"
-COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to edit name of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_OWN="Areas Edit Own"
 COM_SUPPORTGROUPS_AREAS_EDIT_OWN_DESC="Allows the users in this group to edit edit own areas created by them"
 COM_SUPPORTGROUPS_AREAS_EDIT_REGION="Areas Edit Region"
-COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to update the edit region of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to edit region of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_STATE="Areas Edit State"
 COM_SUPPORTGROUPS_AREAS_EDIT_STATE_DESC="Allows the users in this group to update the state of the area"
 COM_SUPPORTGROUPS_AREAS_EDIT_VERSION="Areas Edit Version"
@@ -156,7 +156,7 @@ COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNFEATURED_1="%s Area unfeatured."
 COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNPUBLISHED="%s Areas unpublished."
 COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNPUBLISHED_1="%s Area unpublished."
 COM_SUPPORTGROUPS_AREAS_SUBMENU="Areas Submenu"
-COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to update the submenu of the area"
+COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to submenu of area"
 COM_SUPPORTGROUPS_AREA_ALIAS="Alias"
 COM_SUPPORTGROUPS_AREA_ALIAS_HINT="Auto-generated from name"
 COM_SUPPORTGROUPS_AREA_ALIAS_LABEL="Alias"
@@ -209,14 +209,14 @@ COM_SUPPORTGROUPS_AREA_TYPES_DELETE="Area Types Delete"
 COM_SUPPORTGROUPS_AREA_TYPES_DELETE_DESC="Allows the users in this group to delete delete area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT="Area Types Edit"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS="Area Types Edit Alias"
-COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area type"
+COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY="Area Types Edit Created By"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE="Area Types Edit Created Date"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_DESC="Allows the users in this group to edit the area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME="Area Types Edit Name"
-COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area type"
+COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN="Area Types Edit Own"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own area types created by them"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_STATE="Area Types Edit State"
@@ -361,7 +361,19 @@ COM_SUPPORTGROUPS_CONTRIBUTOR="Contributor"
 COM_SUPPORTGROUPS_CONTRIBUTORS="Contributors"
 COM_SUPPORTGROUPS_COUNTRIES="Countries"
 COM_SUPPORTGROUPS_COUNTRIES_ACCESS="Countries Access"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS="Countries Access Alias"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE="Countries Access Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC="Allows the users in this group to access codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO="Countries Access Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC="Allows the users in this group to access codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY="Countries Access Currency"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC="Allows the users in this group to access currency of country"
 COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC="Allows the users in this group to access access countries"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME="Countries Access Name"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC="Allows the users in this group to access name of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE="Countries Access Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC="Allows the users in this group to access worldzone of country"
 COM_SUPPORTGROUPS_COUNTRIES_BATCH_OPTIONS="Batch process the selected Countries"
 COM_SUPPORTGROUPS_COUNTRIES_BATCH_TIP="All changes will be applied to all selected Countries"
 COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE="Countries Batch Use"
@@ -369,17 +381,29 @@ COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE_DESC="Allows users in this group to use ba
 COM_SUPPORTGROUPS_COUNTRIES_CREATE="Countries Create"
 COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC="Allows the users in this group to create create countries"
 COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST="Countries Dashboard List"
-COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the country"
+COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of country"
 COM_SUPPORTGROUPS_COUNTRIES_DELETE="Countries Delete"
 COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC="Allows the users in this group to delete delete countries"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT="Countries Edit"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS="Countries Edit Alias"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE="Countries Edit Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC="Allows the users in this group to edit codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO="Countries Edit Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC="Allows the users in this group to edit codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY="Countries Edit Currency"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC="Allows the users in this group to edit currency of country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_DESC="Allows the users in this group to edit the country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME="Countries Edit Name"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC="Allows the users in this group to edit name of country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN="Countries Edit Own"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own countries created by them"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE="Countries Edit State"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION="Countries Edit Version"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version countries"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE="Countries Edit Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC="Allows the users in this group to edit worldzone of country"
 COM_SUPPORTGROUPS_COUNTRIES_EXPORT="Countries Export"
 COM_SUPPORTGROUPS_COUNTRIES_EXPORT_DESC="Allows the users in this group to export export countries"
 COM_SUPPORTGROUPS_COUNTRIES_IMPORT="Countries Import"
@@ -402,7 +426,19 @@ COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNFEATURED_1="%s Country unfeatured."
 COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNPUBLISHED="%s Countries unpublished."
 COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNPUBLISHED_1="%s Country unpublished."
 COM_SUPPORTGROUPS_COUNTRIES_SUBMENU="Countries Submenu"
-COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country"
+COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS="Countries View Alias"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC="Allows the users in this group to view alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE="Countries View Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC="Allows the users in this group to view codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO="Countries View Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC="Allows the users in this group to view codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY="Countries View Currency"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC="Allows the users in this group to view currency of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME="Countries View Name"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC="Allows the users in this group to view name of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE="Countries View Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC="Allows the users in this group to view worldzone of country"
 COM_SUPPORTGROUPS_COUNTRY="Country"
 COM_SUPPORTGROUPS_COUNTRY_ALIAS="Alias"
 COM_SUPPORTGROUPS_COUNTRY_ALIAS_HINT="Auto-generated from name"
@@ -462,7 +498,7 @@ COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE_DESC="Allows users in this group to use b
 COM_SUPPORTGROUPS_CURRENCIES_CREATE="Currencies Create"
 COM_SUPPORTGROUPS_CURRENCIES_CREATE_DESC="Allows the users in this group to create create currencies"
 COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST="Currencies Dashboard List"
-COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the currency"
+COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of currency"
 COM_SUPPORTGROUPS_CURRENCIES_DELETE="Currencies Delete"
 COM_SUPPORTGROUPS_CURRENCIES_DELETE_DESC="Allows the users in this group to delete delete currencies"
 COM_SUPPORTGROUPS_CURRENCIES_EDIT="Currencies Edit"
@@ -495,7 +531,7 @@ COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNFEATURED_1="%s Currency unfeatured."
 COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNPUBLISHED="%s Currencies unpublished."
 COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNPUBLISHED_1="%s Currency unpublished."
 COM_SUPPORTGROUPS_CURRENCIES_SUBMENU="Currencies Submenu"
-COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency"
+COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency"
 COM_SUPPORTGROUPS_CURRENCY="Currency"
 COM_SUPPORTGROUPS_CURRENCY_ALIAS="Alias"
 COM_SUPPORTGROUPS_CURRENCY_ALIAS_HINT="Auto-generated from name"
@@ -604,31 +640,31 @@ COM_SUPPORTGROUPS_FACILITIES_BATCH_USE_DESC="Allows users in this group to use b
 COM_SUPPORTGROUPS_FACILITIES_CREATE="Facilities Create"
 COM_SUPPORTGROUPS_FACILITIES_CREATE_DESC="Allows the users in this group to create create facilities"
 COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD="Facilities Dashboard Add"
-COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the facility"
+COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of facility"
 COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST="Facilities Dashboard List"
-COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the facility"
+COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of facility"
 COM_SUPPORTGROUPS_FACILITIES_DELETE="Facilities Delete"
 COM_SUPPORTGROUPS_FACILITIES_DELETE_DESC="Allows the users in this group to delete delete facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT="Facilities Edit"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS="Facilities Edit Alias"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY="Facilities Edit Created By"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE="Facilities Edit Created Date"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_DESC="Allows the users in this group to edit the facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS="Facilities Edit Details"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to edit details of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE="Facilities Edit Facility Type"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to update the edit facility type of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to edit facility type of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME="Facilities Edit Name"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER="Facilities Edit Note Set Marker"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to update the edit note set marker of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to edit note set marker of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN="Facilities Edit Own"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facilities created by them"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE="Facilities Edit Phone"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to edit phone of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE="Facilities Edit State"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_VERSION="Facilities Edit Version"
@@ -655,7 +691,7 @@ COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNFEATURED_1="%s Facility unfeatured."
 COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNPUBLISHED="%s Facilities unpublished."
 COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNPUBLISHED_1="%s Facility unpublished."
 COM_SUPPORTGROUPS_FACILITIES_SUBMENU="Facilities Submenu"
-COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the facility"
+COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to submenu of facility"
 COM_SUPPORTGROUPS_FACILITY="Facility"
 COM_SUPPORTGROUPS_FACILITY_ALIAS="Alias"
 COM_SUPPORTGROUPS_FACILITY_ALIAS_HINT="Auto-generated from name"
@@ -711,14 +747,14 @@ COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE="Facility Types Delete"
 COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE_DESC="Allows the users in this group to delete delete facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT="Facility Types Edit"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS="Facility Types Edit Alias"
-COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility type"
+COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY="Facility Types Edit Created By"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE="Facility Types Edit Created Date"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_DESC="Allows the users in this group to edit the facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME="Facility Types Edit Name"
-COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility type"
+COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN="Facility Types Edit Own"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facility types created by them"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_STATE="Facility Types Edit State"
@@ -787,7 +823,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to u
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
-COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -820,7 +856,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNFEATURED_1="%s Help Document unfeatur
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED="%s Help Documents unpublished."
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED_1="%s Help Document unpublished."
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN="Admin"
 COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW="Admin View"
 COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being target."
@@ -947,14 +983,14 @@ COM_SUPPORTGROUPS_INFO_TYPES_DELETE="Info Types Delete"
 COM_SUPPORTGROUPS_INFO_TYPES_DELETE_DESC="Allows the users in this group to delete delete info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT="Info Types Edit"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS="Info Types Edit Alias"
-COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the info type"
+COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY="Info Types Edit Created By"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE="Info Types Edit Created Date"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_DESC="Allows the users in this group to edit the info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME="Info Types Edit Name"
-COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the info type"
+COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN="Info Types Edit Own"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own info types created by them"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_STATE="Info Types Edit State"
@@ -1031,14 +1067,14 @@ COM_SUPPORTGROUPS_PAYMENTS_BATCH_USE_DESC="Allows users in this group to use bat
 COM_SUPPORTGROUPS_PAYMENTS_CREATE="Payments Create"
 COM_SUPPORTGROUPS_PAYMENTS_CREATE_DESC="Allows the users in this group to create create payments"
 COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD="Payments Dashboard Add"
-COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of payment"
 COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST="Payments Dashboard List"
-COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of payment"
 COM_SUPPORTGROUPS_PAYMENTS_DELETE="Payments Delete"
 COM_SUPPORTGROUPS_PAYMENTS_DELETE_DESC="Allows the users in this group to delete delete payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT="Payments Edit"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT="Payments Edit Amount"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to update the edit amount of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to edit amount of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY="Payments Edit Created By"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_DATE="Payments Edit Created Date"
@@ -1049,11 +1085,11 @@ COM_SUPPORTGROUPS_PAYMENTS_EDIT_OWN_DESC="Allows the users in this group to edit
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE="Payments Edit State"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP="Payments Edit Support Group"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to update the edit support group of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to edit support group of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION="Payments Edit Version"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR="Payments Edit Year"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to update the edit year of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to edit year of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EXPORT="Payments Export"
 COM_SUPPORTGROUPS_PAYMENTS_EXPORT_DESC="Allows the users in this group to export export payments"
 COM_SUPPORTGROUPS_PAYMENTS_IMPORT="Payments Import"
@@ -1076,7 +1112,7 @@ COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNFEATURED_1="%s Payment unfeatured."
 COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNPUBLISHED="%s Payments unpublished."
 COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNPUBLISHED_1="%s Payment unpublished."
 COM_SUPPORTGROUPS_PAYMENTS_SUBMENU="Payments Submenu"
-COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to submenu of payment"
 COM_SUPPORTGROUPS_PAYMENT_AMOUNT="Amount"
 COM_SUPPORTGROUPS_PAYMENT_AMOUNT_DESCRIPTION="The amount paid."
 COM_SUPPORTGROUPS_PAYMENT_AMOUNT_HINT="Only Numbers & dot"
@@ -1135,7 +1171,13 @@ COM_SUPPORTGROUPS_PUBLISHED="Published"
 COM_SUPPORTGROUPS_REGION="Region"
 COM_SUPPORTGROUPS_REGIONS="Regions"
 COM_SUPPORTGROUPS_REGIONS_ACCESS="Regions Access"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS="Regions Access Alias"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of region"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY="Regions Access Country"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of region"
 COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC="Allows the users in this group to access access regions"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME="Regions Access Name"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC="Allows the users in this group to access name of region"
 COM_SUPPORTGROUPS_REGIONS_BATCH_OPTIONS="Batch process the selected Regions"
 COM_SUPPORTGROUPS_REGIONS_BATCH_TIP="All changes will be applied to all selected Regions"
 COM_SUPPORTGROUPS_REGIONS_BATCH_USE="Regions Batch Use"
@@ -1143,23 +1185,23 @@ COM_SUPPORTGROUPS_REGIONS_BATCH_USE_DESC="Allows users in this group to use batc
 COM_SUPPORTGROUPS_REGIONS_CREATE="Regions Create"
 COM_SUPPORTGROUPS_REGIONS_CREATE_DESC="Allows the users in this group to create create regions"
 COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD="Regions Dashboard Add"
-COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the region"
+COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of region"
 COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST="Regions Dashboard List"
-COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the region"
+COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of region"
 COM_SUPPORTGROUPS_REGIONS_DELETE="Regions Delete"
 COM_SUPPORTGROUPS_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT="Regions Edit"
 COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS="Regions Edit Alias"
-COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY="Regions Edit Country"
-COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY="Regions Edit Created By"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT_DESC="Allows the users in this group to edit the region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_NAME="Regions Edit Name"
-COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_OWN="Regions Edit Own"
 COM_SUPPORTGROUPS_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them"
 COM_SUPPORTGROUPS_REGIONS_EDIT_STATE="Regions Edit State"
@@ -1188,7 +1230,13 @@ COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNFEATURED_1="%s Region unfeatured."
 COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNPUBLISHED="%s Regions unpublished."
 COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNPUBLISHED_1="%s Region unpublished."
 COM_SUPPORTGROUPS_REGIONS_SUBMENU="Regions Submenu"
-COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the region"
+COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to submenu of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS="Regions View Alias"
+COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC="Allows the users in this group to view alias of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY="Regions View Country"
+COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_NAME="Regions View Name"
+COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC="Allows the users in this group to view name of region"
 COM_SUPPORTGROUPS_REGION_ALIAS="Alias"
 COM_SUPPORTGROUPS_REGION_ALIAS_HINT="Auto-generated from name"
 COM_SUPPORTGROUPS_REGION_ALIAS_LABEL="Alias"
@@ -1246,43 +1294,43 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_BATCH_USE_DESC="Allows users in this group to u
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE="Support Groups Create"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE_DESC="Allows the users in this group to create create support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD="Support Groups Dashboard Add"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST="Support Groups Dashboard List"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE="Support Groups Delete"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE_DESC="Allows the users in this group to delete delete support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT="Support Groups Edit"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS="Support Groups Edit Alias"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA="Support Groups Edit Area"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to update the edit area of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to edit area of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY="Support Groups Edit Created By"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE="Support Groups Edit Created Date"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DESC="Allows the users in this group to edit the support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS="Support Groups Edit Details"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY="Support Groups Edit Facility"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to update the edit facility of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to edit facility of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE="Support Groups Edit Female"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART="Support Groups Edit Female Art"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to update the edit female art of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to edit female art of support group"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to update the edit female of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to edit female of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO="Support Groups Edit Info"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to update the edit info of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to edit info of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE="Support Groups Edit Male"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART="Support Groups Edit Male Art"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to update the edit male art of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to edit male art of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN="Support Groups Edit Male Children"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to update the edit male children of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to edit male children of support group"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to update the edit male of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to edit male of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME="Support Groups Edit Name"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to edit name of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN="Support Groups Edit Own"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN_DESC="Allows the users in this group to edit edit own support groups created by them"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE="Support Groups Edit Phone"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to edit phone of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE="Support Groups Edit State"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE_DESC="Allows the users in this group to update the state of the support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_VERSION="Support Groups Edit Version"
@@ -1309,7 +1357,7 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNFEATURED_1="%s Support Group unfeatur
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNPUBLISHED="%s Support Groups unpublished."
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNPUBLISHED_1="%s Support Group unpublished."
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU="Support Groups Submenu"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to update the submenu of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to submenu of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS="Alias"
 COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS_HINT="Auto-generated from name"
 COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS_LABEL="Alias"

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

@@ -6,25 +6,25 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_BATCH_USE_DESC="Allows users in this gr
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE="Additional Information Create"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE_DESC="Allows the users in this group to create create additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD="Additional Information Dashboard Add"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST="Additional Information Dashboard List"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE="Additional Information Delete"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE_DESC="Allows the users in this group to delete delete additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT="Additional Information Edit"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS="Additional Information Edit Alias"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY="Additional Information Edit Created By"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE="Additional Information Edit Created Date"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DESC="Allows the users in this group to edit the additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS="Additional Information Edit Details"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to edit details of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE="Additional Information Edit Info Type"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to update the edit info type of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to edit info type of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME="Additional Information Edit Name"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to edit name of additional info"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN="Additional Information Edit Own"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN_DESC="Allows the users in this group to edit edit own additional information created by them"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_STATE="Additional Information Edit State"
@@ -36,7 +36,7 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EXPORT_DESC="Allows the users in this g
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_IMPORT="Additional Information Import"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_IMPORT_DESC="Allows the users in this group to import import additional information"
 COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU="Additional Information Submenu"
-COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to update the submenu of the additional info"
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to submenu of additional info"
 COM_SUPPORTGROUPS_AREAS_ACCESS="Areas Access"
 COM_SUPPORTGROUPS_AREAS_ACCESS_DESC="Allows the users in this group to access access areas"
 COM_SUPPORTGROUPS_AREAS_BATCH_USE="Areas Batch Use"
@@ -44,31 +44,31 @@ COM_SUPPORTGROUPS_AREAS_BATCH_USE_DESC="Allows users in this group to use batch
 COM_SUPPORTGROUPS_AREAS_CREATE="Areas Create"
 COM_SUPPORTGROUPS_AREAS_CREATE_DESC="Allows the users in this group to create create areas"
 COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD="Areas Dashboard Add"
-COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the area"
+COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of area"
 COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST="Areas Dashboard List"
-COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the area"
+COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of area"
 COM_SUPPORTGROUPS_AREAS_DELETE="Areas Delete"
 COM_SUPPORTGROUPS_AREAS_DELETE_DESC="Allows the users in this group to delete delete areas"
 COM_SUPPORTGROUPS_AREAS_EDIT="Areas Edit"
 COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS="Areas Edit Alias"
-COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE="Areas Edit Area Type"
-COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to update the edit area type of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to edit area type of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_COLOR="Areas Edit Color"
-COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to update the edit color of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to edit color of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY="Areas Edit Created By"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by areas"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE="Areas Edit Created Date"
 COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created areas"
 COM_SUPPORTGROUPS_AREAS_EDIT_DESC="Allows the users in this group to edit the area"
 COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS="Areas Edit Details"
-COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_NAME="Areas Edit Name"
-COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to edit name of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_OWN="Areas Edit Own"
 COM_SUPPORTGROUPS_AREAS_EDIT_OWN_DESC="Allows the users in this group to edit edit own areas created by them"
 COM_SUPPORTGROUPS_AREAS_EDIT_REGION="Areas Edit Region"
-COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to update the edit region of the area"
+COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to edit region of area"
 COM_SUPPORTGROUPS_AREAS_EDIT_STATE="Areas Edit State"
 COM_SUPPORTGROUPS_AREAS_EDIT_STATE_DESC="Allows the users in this group to update the state of the area"
 COM_SUPPORTGROUPS_AREAS_EDIT_VERSION="Areas Edit Version"
@@ -78,7 +78,7 @@ COM_SUPPORTGROUPS_AREAS_EXPORT_DESC="Allows the users in this group to export ex
 COM_SUPPORTGROUPS_AREAS_IMPORT="Areas Import"
 COM_SUPPORTGROUPS_AREAS_IMPORT_DESC="Allows the users in this group to import import areas"
 COM_SUPPORTGROUPS_AREAS_SUBMENU="Areas Submenu"
-COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to update the submenu of the area"
+COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to submenu of area"
 COM_SUPPORTGROUPS_AREA_TYPES_ACCESS="Area Types Access"
 COM_SUPPORTGROUPS_AREA_TYPES_ACCESS_DESC="Allows the users in this group to access access area types"
 COM_SUPPORTGROUPS_AREA_TYPES_BATCH_USE="Area Types Batch Use"
@@ -89,14 +89,14 @@ COM_SUPPORTGROUPS_AREA_TYPES_DELETE="Area Types Delete"
 COM_SUPPORTGROUPS_AREA_TYPES_DELETE_DESC="Allows the users in this group to delete delete area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT="Area Types Edit"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS="Area Types Edit Alias"
-COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area type"
+COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY="Area Types Edit Created By"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE="Area Types Edit Created Date"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created area types"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_DESC="Allows the users in this group to edit the area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME="Area Types Edit Name"
-COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area type"
+COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of area type"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN="Area Types Edit Own"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own area types created by them"
 COM_SUPPORTGROUPS_AREA_TYPES_EDIT_STATE="Area Types Edit State"
@@ -109,29 +109,65 @@ COM_SUPPORTGROUPS_AREA_TYPES_IMPORT="Area Types Import"
 COM_SUPPORTGROUPS_AREA_TYPES_IMPORT_DESC="Allows the users in this group to import import area types"
 COM_SUPPORTGROUPS_CONFIGURATION="Support Groups Configuration"
 COM_SUPPORTGROUPS_COUNTRIES_ACCESS="Countries Access"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS="Countries Access Alias"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE="Countries Access Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC="Allows the users in this group to access codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO="Countries Access Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC="Allows the users in this group to access codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY="Countries Access Currency"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC="Allows the users in this group to access currency of country"
 COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC="Allows the users in this group to access access countries"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME="Countries Access Name"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC="Allows the users in this group to access name of country"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE="Countries Access Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC="Allows the users in this group to access worldzone of country"
 COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE="Countries Batch Use"
 COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch countries"
 COM_SUPPORTGROUPS_COUNTRIES_CREATE="Countries Create"
 COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC="Allows the users in this group to create create countries"
 COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST="Countries Dashboard List"
-COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the country"
+COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of country"
 COM_SUPPORTGROUPS_COUNTRIES_DELETE="Countries Delete"
 COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC="Allows the users in this group to delete delete countries"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT="Countries Edit"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS="Countries Edit Alias"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE="Countries Edit Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC="Allows the users in this group to edit codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO="Countries Edit Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC="Allows the users in this group to edit codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY="Countries Edit Currency"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC="Allows the users in this group to edit currency of country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_DESC="Allows the users in this group to edit the country"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME="Countries Edit Name"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC="Allows the users in this group to edit name of country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN="Countries Edit Own"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own countries created by them"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE="Countries Edit State"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the country"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION="Countries Edit Version"
 COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version countries"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE="Countries Edit Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC="Allows the users in this group to edit worldzone of country"
 COM_SUPPORTGROUPS_COUNTRIES_EXPORT="Countries Export"
 COM_SUPPORTGROUPS_COUNTRIES_EXPORT_DESC="Allows the users in this group to export export countries"
 COM_SUPPORTGROUPS_COUNTRIES_IMPORT="Countries Import"
 COM_SUPPORTGROUPS_COUNTRIES_IMPORT_DESC="Allows the users in this group to import import countries"
 COM_SUPPORTGROUPS_COUNTRIES_SUBMENU="Countries Submenu"
-COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country"
+COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS="Countries View Alias"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC="Allows the users in this group to view alias of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE="Countries View Codethree"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC="Allows the users in this group to view codethree of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO="Countries View Codetwo"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC="Allows the users in this group to view codetwo of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY="Countries View Currency"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC="Allows the users in this group to view currency of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME="Countries View Name"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC="Allows the users in this group to view name of country"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE="Countries View Worldzone"
+COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC="Allows the users in this group to view worldzone of country"
 COM_SUPPORTGROUPS_CURRENCIES_ACCESS="Currencies Access"
 COM_SUPPORTGROUPS_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies"
 COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE="Currencies Batch Use"
@@ -139,7 +175,7 @@ COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE_DESC="Allows users in this group to use b
 COM_SUPPORTGROUPS_CURRENCIES_CREATE="Currencies Create"
 COM_SUPPORTGROUPS_CURRENCIES_CREATE_DESC="Allows the users in this group to create create currencies"
 COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST="Currencies Dashboard List"
-COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the currency"
+COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of currency"
 COM_SUPPORTGROUPS_CURRENCIES_DELETE="Currencies Delete"
 COM_SUPPORTGROUPS_CURRENCIES_DELETE_DESC="Allows the users in this group to delete delete currencies"
 COM_SUPPORTGROUPS_CURRENCIES_EDIT="Currencies Edit"
@@ -155,7 +191,7 @@ COM_SUPPORTGROUPS_CURRENCIES_EXPORT_DESC="Allows the users in this group to expo
 COM_SUPPORTGROUPS_CURRENCIES_IMPORT="Currencies Import"
 COM_SUPPORTGROUPS_CURRENCIES_IMPORT_DESC="Allows the users in this group to import import currencies"
 COM_SUPPORTGROUPS_CURRENCIES_SUBMENU="Currencies Submenu"
-COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency"
+COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency"
 COM_SUPPORTGROUPS_EDIT_CREATED_BY="Edit Created By"
 COM_SUPPORTGROUPS_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_SUPPORTGROUPS_EDIT_CREATED_DATE="Edit Created Date"
@@ -171,31 +207,31 @@ COM_SUPPORTGROUPS_FACILITIES_BATCH_USE_DESC="Allows users in this group to use b
 COM_SUPPORTGROUPS_FACILITIES_CREATE="Facilities Create"
 COM_SUPPORTGROUPS_FACILITIES_CREATE_DESC="Allows the users in this group to create create facilities"
 COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD="Facilities Dashboard Add"
-COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the facility"
+COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of facility"
 COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST="Facilities Dashboard List"
-COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the facility"
+COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of facility"
 COM_SUPPORTGROUPS_FACILITIES_DELETE="Facilities Delete"
 COM_SUPPORTGROUPS_FACILITIES_DELETE_DESC="Allows the users in this group to delete delete facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT="Facilities Edit"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS="Facilities Edit Alias"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY="Facilities Edit Created By"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE="Facilities Edit Created Date"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facilities"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_DESC="Allows the users in this group to edit the facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS="Facilities Edit Details"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to edit details of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE="Facilities Edit Facility Type"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to update the edit facility type of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to edit facility type of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME="Facilities Edit Name"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER="Facilities Edit Note Set Marker"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to update the edit note set marker of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to edit note set marker of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN="Facilities Edit Own"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facilities created by them"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE="Facilities Edit Phone"
-COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the facility"
+COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to edit phone of facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE="Facilities Edit State"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the facility"
 COM_SUPPORTGROUPS_FACILITIES_EDIT_VERSION="Facilities Edit Version"
@@ -205,7 +241,7 @@ COM_SUPPORTGROUPS_FACILITIES_EXPORT_DESC="Allows the users in this group to expo
 COM_SUPPORTGROUPS_FACILITIES_IMPORT="Facilities Import"
 COM_SUPPORTGROUPS_FACILITIES_IMPORT_DESC="Allows the users in this group to import import facilities"
 COM_SUPPORTGROUPS_FACILITIES_SUBMENU="Facilities Submenu"
-COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the facility"
+COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to submenu of facility"
 COM_SUPPORTGROUPS_FACILITY_TYPES_ACCESS="Facility Types Access"
 COM_SUPPORTGROUPS_FACILITY_TYPES_ACCESS_DESC="Allows the users in this group to access access facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_BATCH_USE="Facility Types Batch Use"
@@ -216,14 +252,14 @@ COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE="Facility Types Delete"
 COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE_DESC="Allows the users in this group to delete delete facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT="Facility Types Edit"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS="Facility Types Edit Alias"
-COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility type"
+COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY="Facility Types Edit Created By"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE="Facility Types Edit Created Date"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facility types"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_DESC="Allows the users in this group to edit the facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME="Facility Types Edit Name"
-COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility type"
+COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility type"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN="Facility Types Edit Own"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facility types created by them"
 COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_STATE="Facility Types Edit State"
@@ -241,7 +277,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to u
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
-COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -257,7 +293,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_IMPORT="Help Documents Import"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents"
 COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_SUPPORTGROUPS_IMPORT_DATA="Import Data"
 COM_SUPPORTGROUPS_IMPORT_DATA_DESC=" Allows users in this group to import data."
 COM_SUPPORTGROUPS_INFO_TYPES_ACCESS="Info Types Access"
@@ -270,14 +306,14 @@ COM_SUPPORTGROUPS_INFO_TYPES_DELETE="Info Types Delete"
 COM_SUPPORTGROUPS_INFO_TYPES_DELETE_DESC="Allows the users in this group to delete delete info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT="Info Types Edit"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS="Info Types Edit Alias"
-COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the info type"
+COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY="Info Types Edit Created By"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE="Info Types Edit Created Date"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created info types"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_DESC="Allows the users in this group to edit the info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME="Info Types Edit Name"
-COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the info type"
+COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of info type"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN="Info Types Edit Own"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own info types created by them"
 COM_SUPPORTGROUPS_INFO_TYPES_EDIT_STATE="Info Types Edit State"
@@ -309,14 +345,14 @@ COM_SUPPORTGROUPS_PAYMENTS_BATCH_USE_DESC="Allows users in this group to use bat
 COM_SUPPORTGROUPS_PAYMENTS_CREATE="Payments Create"
 COM_SUPPORTGROUPS_PAYMENTS_CREATE_DESC="Allows the users in this group to create create payments"
 COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD="Payments Dashboard Add"
-COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of payment"
 COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST="Payments Dashboard List"
-COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of payment"
 COM_SUPPORTGROUPS_PAYMENTS_DELETE="Payments Delete"
 COM_SUPPORTGROUPS_PAYMENTS_DELETE_DESC="Allows the users in this group to delete delete payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT="Payments Edit"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT="Payments Edit Amount"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to update the edit amount of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to edit amount of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY="Payments Edit Created By"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_DATE="Payments Edit Created Date"
@@ -327,41 +363,47 @@ COM_SUPPORTGROUPS_PAYMENTS_EDIT_OWN_DESC="Allows the users in this group to edit
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE="Payments Edit State"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP="Payments Edit Support Group"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to update the edit support group of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to edit support group of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION="Payments Edit Version"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version payments"
 COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR="Payments Edit Year"
-COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to update the edit year of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to edit year of payment"
 COM_SUPPORTGROUPS_PAYMENTS_EXPORT="Payments Export"
 COM_SUPPORTGROUPS_PAYMENTS_EXPORT_DESC="Allows the users in this group to export export payments"
 COM_SUPPORTGROUPS_PAYMENTS_IMPORT="Payments Import"
 COM_SUPPORTGROUPS_PAYMENTS_IMPORT_DESC="Allows the users in this group to import import payments"
 COM_SUPPORTGROUPS_PAYMENTS_SUBMENU="Payments Submenu"
-COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the payment"
+COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to submenu of payment"
 COM_SUPPORTGROUPS_REGIONS_ACCESS="Regions Access"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS="Regions Access Alias"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of region"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY="Regions Access Country"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of region"
 COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC="Allows the users in this group to access access regions"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME="Regions Access Name"
+COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC="Allows the users in this group to access name of region"
 COM_SUPPORTGROUPS_REGIONS_BATCH_USE="Regions Batch Use"
 COM_SUPPORTGROUPS_REGIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch regions"
 COM_SUPPORTGROUPS_REGIONS_CREATE="Regions Create"
 COM_SUPPORTGROUPS_REGIONS_CREATE_DESC="Allows the users in this group to create create regions"
 COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD="Regions Dashboard Add"
-COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the region"
+COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of region"
 COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST="Regions Dashboard List"
-COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the region"
+COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of region"
 COM_SUPPORTGROUPS_REGIONS_DELETE="Regions Delete"
 COM_SUPPORTGROUPS_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT="Regions Edit"
 COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS="Regions Edit Alias"
-COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY="Regions Edit Country"
-COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY="Regions Edit Created By"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date"
 COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions"
 COM_SUPPORTGROUPS_REGIONS_EDIT_DESC="Allows the users in this group to edit the region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_NAME="Regions Edit Name"
-COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region"
+COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region"
 COM_SUPPORTGROUPS_REGIONS_EDIT_OWN="Regions Edit Own"
 COM_SUPPORTGROUPS_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them"
 COM_SUPPORTGROUPS_REGIONS_EDIT_STATE="Regions Edit State"
@@ -373,7 +415,13 @@ COM_SUPPORTGROUPS_REGIONS_EXPORT_DESC="Allows the users in this group to export
 COM_SUPPORTGROUPS_REGIONS_IMPORT="Regions Import"
 COM_SUPPORTGROUPS_REGIONS_IMPORT_DESC="Allows the users in this group to import import regions"
 COM_SUPPORTGROUPS_REGIONS_SUBMENU="Regions Submenu"
-COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the region"
+COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to submenu of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS="Regions View Alias"
+COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC="Allows the users in this group to view alias of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY="Regions View Country"
+COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of region"
+COM_SUPPORTGROUPS_REGIONS_VIEW_NAME="Regions View Name"
+COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC="Allows the users in this group to view name of region"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS="Support Groups Access"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_DESC="Allows the users in this group to access access support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_SITE="Support Groups (Site) Access"
@@ -383,43 +431,43 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_BATCH_USE_DESC="Allows users in this group to u
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE="Support Groups Create"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE_DESC="Allows the users in this group to create create support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD="Support Groups Dashboard Add"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST="Support Groups Dashboard List"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE="Support Groups Delete"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE_DESC="Allows the users in this group to delete delete support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT="Support Groups Edit"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS="Support Groups Edit Alias"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA="Support Groups Edit Area"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to update the edit area of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to edit area of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY="Support Groups Edit Created By"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE="Support Groups Edit Created Date"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DESC="Allows the users in this group to edit the support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS="Support Groups Edit Details"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY="Support Groups Edit Facility"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to update the edit facility of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to edit facility of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE="Support Groups Edit Female"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART="Support Groups Edit Female Art"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to update the edit female art of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to edit female art of support group"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to update the edit female of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to edit female of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO="Support Groups Edit Info"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to update the edit info of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to edit info of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE="Support Groups Edit Male"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART="Support Groups Edit Male Art"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to update the edit male art of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to edit male art of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN="Support Groups Edit Male Children"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to update the edit male children of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to edit male children of support group"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to update the edit male of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to edit male of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME="Support Groups Edit Name"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to edit name of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN="Support Groups Edit Own"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN_DESC="Allows the users in this group to edit edit own support groups created by them"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE="Support Groups Edit Phone"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to edit phone of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE="Support Groups Edit State"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE_DESC="Allows the users in this group to update the state of the support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_VERSION="Support Groups Edit Version"
@@ -429,7 +477,7 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_EXPORT_DESC="Allows the users in this group to
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_IMPORT="Support Groups Import"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_IMPORT_DESC="Allows the users in this group to import import support groups"
 COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU="Support Groups Submenu"
-COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to update the submenu of the support group"
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to submenu of support group"
 COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS="Support Group Smart Export Button Access"
 COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS_DESC=" Allows the users in this group to access the smart export button."
 COM_SUPPORTGROUPS_USE_BATCH="Use Batch"

admin/layouts/additional_info/metadata.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		metadata.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/additional_info/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/additional_info/settings_above.php

@@ -6,37 +6,41 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_above.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'name',
 	'alias'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/additional_info/settings_fullwidth.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array(
 	'details'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
-<?php foreach($fields as $field): ?>
+	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
+	<?php endforeach; ?>
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
-<?php endforeach; ?>
 </div>

admin/layouts/additional_info/settings_left.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_left.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/additional_info/support_groups_fullwidth.php

@@ -6,32 +6,50 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_groups_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vvwsupport_groups;
+$items = $displayData->vvwsupport_groups;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
-$edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit";
+// set the edit URL
+$edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit";
+// set a return value
+$return = ($id) ? "index.php?option=com_supportgroups&view=additional_info&layout=edit&id=" . $id : "";
+// check for a return value
+$jinput = JFactory::getApplication()->input;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// check if return value was set
+if (SupportgroupsHelper::checkString($return))
+{
+	// set the referral values
+	$ref = ($id) ? "&ref=additional_info&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
+}
+else
+{
+	$ref = ($id) ? "&ref=additional_info&refid=" . $id : "";
+}
 
 ?>
 <div class="form-vertical">
@@ -73,31 +91,31 @@ $edit = "index.php?option=com_supportgroups&view=support_groups&task=support_gro
 		$canDo = SupportgroupsHelper::getActions('support_group',$item,'support_groups');
 	?>
 	<tr>
-		<td class="nowrap">
+		<td>
 			<?php if ($canDo->get('support_group.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=additional_info&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
-					<?php if ($item->checked_out): ?>
+				<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'support_groups.', $canCheckin); ?>
+					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'support_groups.', $canCheckin); ?>
-					<?php endif; ?>
+				<?php endif; ?>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->name); ?></div>
+				<?php echo $displayData->escape($item->name); ?>
 			<?php endif; ?>
 		</td>
 		<td>
 			<?php echo $displayData->escape($item->phone); ?>
 		</td>
-		<td class="nowrap">
+		<td>
 			<?php if ($user->authorise('area.edit', 'com_supportgroups.area.' . (int)$item->area)): ?>
-				<a href="index.php?option=com_supportgroups&view=areas&task=area.edit&id=<?php echo $item->area; ?>&ref=additional_info&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->area_name); ?></a>
+				<a href="index.php?option=com_supportgroups&view=areas&task=area.edit&id=<?php echo $item->area; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->area_name); ?></a>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->area_name); ?></div>
+				<?php echo $displayData->escape($item->area_name); ?>
 			<?php endif; ?>
 		</td>
-		<td class="nowrap">
+		<td>
 			<?php if ($user->authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?>
-				<a href="index.php?option=com_supportgroups&view=facilities&task=facility.edit&id=<?php echo $item->facility; ?>&ref=additional_info&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->facility_name); ?></a>
+				<a href="index.php?option=com_supportgroups&view=facilities&task=facility.edit&id=<?php echo $item->facility; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->facility_name); ?></a>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->facility_name); ?></div>
+				<?php echo $displayData->escape($item->facility_name); ?>
 			<?php endif; ?>
 		</td>
 		<td>

admin/layouts/area/metadata.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		metadata.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/area/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area/settings_above.php

@@ -6,38 +6,42 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_above.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'name',
 	'alias',
 	'area_type'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/area/settings_fullwidth.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array(
 	'details'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
-<?php foreach($fields as $field): ?>
+	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
+	<?php endforeach; ?>
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
-<?php endforeach; ?>
 </div>

admin/layouts/area/settings_left.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_left.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area/settings_right.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_right.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area/support_groups_fullwidth.php

@@ -6,34 +6,53 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		support_groups_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vvxsupport_groups;
+$items = $displayData->vvxsupport_groups;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
+// set the edit URL
 $edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit";
-$ref = ($id) ? "&ref=area&refid=".$id : "";
+// set a return value
-$new = "index.php?option=com_supportgroups&view=support_group&layout=edit".$ref;
+$return = ($id) ? "index.php?option=com_supportgroups&view=area&layout=edit&id=" . $id : "";
+// check for a return value
+$jinput = JFactory::getApplication()->input;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// check if return value was set
+if (SupportgroupsHelper::checkString($return))
+{
+	// set the referral values
+	$ref = ($id) ? "&ref=area&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
+}
+else
+{
+	$ref = ($id) ? "&ref=area&refid=" . $id : "";
+}
+// set the create new URL
+$new = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit" . $ref;
+// load the action object
 $can = SupportgroupsHelper::getActions('support_group');
 
 ?>
@@ -79,14 +98,14 @@ $can = SupportgroupsHelper::getActions('support_group');
 		$canDo = SupportgroupsHelper::getActions('support_group',$item,'support_groups');
 	?>
 	<tr>
-		<td class="nowrap">
+		<td>
 			<?php if ($canDo->get('support_group.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=area&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
-					<?php if ($item->checked_out): ?>
+				<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'support_groups.', $canCheckin); ?>
+					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'support_groups.', $canCheckin); ?>
-					<?php endif; ?>
+				<?php endif; ?>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->name); ?></div>
+				<?php echo $displayData->escape($item->name); ?>
 			<?php endif; ?>
 		</td>
 		<td>
@@ -95,11 +114,11 @@ $can = SupportgroupsHelper::getActions('support_group');
 		<td>
 			<?php echo $displayData->escape($item->area_name); ?>
 		</td>
-		<td class="nowrap">
+		<td>
 			<?php if ($user->authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?>
-				<a href="index.php?option=com_supportgroups&view=facilities&task=facility.edit&id=<?php echo $item->facility; ?>&ref=area&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->facility_name); ?></a>
+				<a href="index.php?option=com_supportgroups&view=facilities&task=facility.edit&id=<?php echo $item->facility; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->facility_name); ?></a>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->facility_name); ?></div>
+				<?php echo $displayData->escape($item->facility_name); ?>
 			<?php endif; ?>
 		</td>
 		<td>

admin/layouts/area_type/details_left.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		details_left.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area_type/details_right.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		details_right.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area_type/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/area_type/publlshing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publlshing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/batchselection.php

@@ -6,29 +6,29 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		batchselection.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
 defined('JPATH_BASE') or die;
 
 JHtmlBehavior::core();
-$divWrapper 	= range(1,120,2);
+$divWrapper = range(1,120,2);
-$counter 		= 0;
+$counter = 0;
 ?>
 <?php if ($displayData->ListSelection) : ?>
 <div class="row-fluid">

admin/layouts/country/metadata.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		metadata.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/country/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/country/regions_fullwidth.php

@@ -6,40 +6,64 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		regions_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vvyregions;
+$items = $displayData->vvyregions;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
+// set the edit URL
 $edit = "index.php?option=com_supportgroups&view=regions&task=region.edit";
-$ref = ($id) ? "&ref=country&refid=".$id : "";
+// set a return value
-$new = "index.php?option=com_supportgroups&view=region&layout=edit".$ref;
+$return = ($id) ? "index.php?option=com_supportgroups&view=country&layout=edit&id=" . $id : "";
+// check for a return value
+$jinput = JFactory::getApplication()->input;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// check if return value was set
+if (SupportgroupsHelper::checkString($return))
+{
+	// set the referral values
+	$ref = ($id) ? "&ref=country&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
+}
+else
+{
+	$ref = ($id) ? "&ref=country&refid=" . $id : "";
+}
+// set the create new URL
+$new = "index.php?option=com_supportgroups&view=regions&task=region.edit" . $ref;
+// set the create new and close URL
+$close_new = "index.php?option=com_supportgroups&view=regions&task=region.edit";
+// load the action object
 $can = SupportgroupsHelper::getActions('region');
 
 ?>
 <div class="form-vertical">
 <?php if ($can->get('region.create')): ?>
-	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SUPPORTGROUPS_NEW'); ?></a><br /><br />
+	<div class="btn-group">
+		<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SUPPORTGROUPS_NEW'); ?></a>
+		<a class="btn btn-small" onclick="Joomla.submitbutton('country.cancel');" href="<?php echo $close_new; ?>"><span class="icon-new"></span> <?php echo JText::_('COM_SUPPORTGROUPS_CLOSE_NEW'); ?></a>
+	</div><br /><br />
 <?php endif; ?>
 <?php if (SupportgroupsHelper::checkArray($items)): ?>
 <table class="footable table data regions" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
@@ -67,14 +91,14 @@ $can = SupportgroupsHelper::getActions('region');
 		$canDo = SupportgroupsHelper::getActions('region',$item,'regions');
 	?>
 	<tr>
-		<td class="nowrap">
+		<td>
 			<?php if ($canDo->get('region.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=country&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
-					<?php if ($item->checked_out): ?>
+				<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'regions.', $canCheckin); ?>
+					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'regions.', $canCheckin); ?>
-					<?php endif; ?>
+				<?php endif; ?>
 			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->name); ?></div>
+				<?php echo $displayData->escape($item->name); ?>
 			<?php endif; ?>
 		</td>
 		<td>

admin/layouts/country/settings_above.php

@@ -6,37 +6,41 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_above.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'name',
 	'alias'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/country/settings_left.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_left.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -36,20 +35,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/country/settings_right.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_right.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -36,20 +35,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/currency/details_above.php

@@ -6,37 +6,41 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		details_above.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'name',
 	'alias'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/currency/details_left.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		details_left.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -38,20 +37,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/currency/details_right.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		details_right.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -38,20 +37,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/currency/metadata.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		metadata.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/currency/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/facility/location_fullwidth.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		location_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_set_marker'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
-<?php foreach($fields as $field): ?>
+	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
+	<?php endforeach; ?>
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
-<?php endforeach; ?>
 </div>

admin/layouts/facility/metadata.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		metadata.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/facility/publishing.php

@@ -6,28 +6,26 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		publishing.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/facility/settings_above.php

@@ -6,37 +6,41 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_above.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'name',
 	'alias'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/facility/settings_fullwidth.php

@@ -6,25 +6,24 @@
       \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
        \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
         \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
+                                                        | |
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		1.0.8
+	@version		1.0.10
-	@build			5th May, 2018
+	@build			4th April, 2019
 	@created		24th February, 2016
 	@package		Support Groups
 	@subpackage		settings_fullwidth.php
-	@author			Llewellyn van der Merwe <http://www.vdm.io>	
+	@author			Llewellyn van der Merwe <http://www.vdm.io>
 	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-	
+
-	Support Groups 
+	Support Groups
-                                                             
+
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
@@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array(
 	'details'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
-<?php foreach($fields as $field): ?>
+	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
+	<?php endforeach; ?>
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
-<?php endforeach; ?>
 </div>