diff --git a/README.md b/README.md
index e0afbbb..939539c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
This is a [Joomla 3.x](http://www.joomla.org/) component.
- ![Support Groups image](https://github.com/namibia/Joomla-Support-Groups/raw/master/admin/assets/images/vdm-component.jpg "The Support Groups")
+ ![Support Groups image](https://github.com/Llewellynvdm/Joomla-Support-Groups/raw/master/admin/assets/images/vdm-component.jpg "The Support Groups")
Support Groups component adds the ability to your Joomla website to manage various support groups and their related details. Integration with Google Maps is one of its main features.
@@ -12,14 +12,14 @@ 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*: 30th May, 2020
++ *Last Build*: 6th January, 2021
+ *Version*: 1.0.11
+ *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*: **69626**
++ *Line count*: **70488**
+ *File count*: **490**
+ *Folder count*: **98**
@@ -28,4 +28,40 @@ Support Groups component adds the ability to your Joomla website to manage vario
# Joomla Component Builder
-For more information about JCB visit [VDM](http://vdm.bz/component-builder) Today! The future is here!
\ No newline at end of file
+For more information about JCB visit [VDM](http://vdm.bz/component-builder) Today! The future is here!
+
+
+## Contributors
+This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder).
+
+[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors)
+
+### Backers
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)]
+
+[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers)
+
+### Sponsors
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)]
+
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website)
\ No newline at end of file
diff --git a/admin/README.txt b/admin/README.txt
index e0afbbb..939539c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -2,7 +2,7 @@
This is a [Joomla 3.x](http://www.joomla.org/) component.
- ![Support Groups image](https://github.com/namibia/Joomla-Support-Groups/raw/master/admin/assets/images/vdm-component.jpg "The Support Groups")
+ ![Support Groups image](https://github.com/Llewellynvdm/Joomla-Support-Groups/raw/master/admin/assets/images/vdm-component.jpg "The Support Groups")
Support Groups component adds the ability to your Joomla website to manage various support groups and their related details. Integration with Google Maps is one of its main features.
@@ -12,14 +12,14 @@ 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*: 30th May, 2020
++ *Last Build*: 6th January, 2021
+ *Version*: 1.0.11
+ *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*: **69626**
++ *Line count*: **70488**
+ *File count*: **490**
+ *Folder count*: **98**
@@ -28,4 +28,40 @@ Support Groups component adds the ability to your Joomla website to manage vario
# Joomla Component Builder
-For more information about JCB visit [VDM](http://vdm.bz/component-builder) Today! The future is here!
\ No newline at end of file
+For more information about JCB visit [VDM](http://vdm.bz/component-builder) Today! The future is here!
+
+
+## Contributors
+This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder).
+
+[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors)
+
+### Backers
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)]
+
+[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers)
+
+### Sponsors
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)]
+
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website)
+[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website)
\ No newline at end of file
diff --git a/admin/assets/css/additional_info.css b/admin/assets/css/additional_info.css
index 2a7e12c..89d7041 100644
--- a/admin/assets/css/additional_info.css
+++ b/admin/assets/css/additional_info.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_info.css
diff --git a/admin/assets/css/additional_information.css b/admin/assets/css/additional_information.css
index ae7a24c..620f1ac 100644
--- a/admin/assets/css/additional_information.css
+++ b/admin/assets/css/additional_information.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_information.css
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 1160f79..0817f3f 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage admin.css
diff --git a/admin/assets/css/area.css b/admin/assets/css/area.css
index 18d7d30..20b42ce 100644
--- a/admin/assets/css/area.css
+++ b/admin/assets/css/area.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area.css
diff --git a/admin/assets/css/area_type.css b/admin/assets/css/area_type.css
index 1181311..90dc374 100644
--- a/admin/assets/css/area_type.css
+++ b/admin/assets/css/area_type.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_type.css
diff --git a/admin/assets/css/area_types.css b/admin/assets/css/area_types.css
index 46914fb..c218185 100644
--- a/admin/assets/css/area_types.css
+++ b/admin/assets/css/area_types.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_types.css
diff --git a/admin/assets/css/areas.css b/admin/assets/css/areas.css
index e431752..5878db6 100644
--- a/admin/assets/css/areas.css
+++ b/admin/assets/css/areas.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage areas.css
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index 98cbe74..b66e9d8 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage countries.css
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index a35a057..92563cd 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage country.css
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index 8124c48..f427e81 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currencies.css
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index e9a48da..862b7fd 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currency.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 7f9daa9..aca1849 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage dashboard.css
diff --git a/admin/assets/css/facilities.css b/admin/assets/css/facilities.css
index 98b3853..42f82db 100644
--- a/admin/assets/css/facilities.css
+++ b/admin/assets/css/facilities.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facilities.css
diff --git a/admin/assets/css/facility.css b/admin/assets/css/facility.css
index caa9c34..4bc6ea4 100644
--- a/admin/assets/css/facility.css
+++ b/admin/assets/css/facility.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility.css
diff --git a/admin/assets/css/facility_type.css b/admin/assets/css/facility_type.css
index 61323e7..61634ef 100644
--- a/admin/assets/css/facility_type.css
+++ b/admin/assets/css/facility_type.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_type.css
diff --git a/admin/assets/css/facility_types.css b/admin/assets/css/facility_types.css
index 5ee9a9d..0d493ed 100644
--- a/admin/assets/css/facility_types.css
+++ b/admin/assets/css/facility_types.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_types.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 5d51232..fa2b85d 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index 7328880..1a13146 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help_documents.css
diff --git a/admin/assets/css/info_type.css b/admin/assets/css/info_type.css
index 2e8df2c..7722f53 100644
--- a/admin/assets/css/info_type.css
+++ b/admin/assets/css/info_type.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_type.css
diff --git a/admin/assets/css/info_types.css b/admin/assets/css/info_types.css
index bb2de1d..4f5a070 100644
--- a/admin/assets/css/info_types.css
+++ b/admin/assets/css/info_types.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_types.css
diff --git a/admin/assets/css/payment.css b/admin/assets/css/payment.css
index 99af645..d276ebd 100644
--- a/admin/assets/css/payment.css
+++ b/admin/assets/css/payment.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payment.css
diff --git a/admin/assets/css/payments.css b/admin/assets/css/payments.css
index d4e5573..920d66d 100644
--- a/admin/assets/css/payments.css
+++ b/admin/assets/css/payments.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payments.css
diff --git a/admin/assets/css/region.css b/admin/assets/css/region.css
index 803dfdb..e2b4987 100644
--- a/admin/assets/css/region.css
+++ b/admin/assets/css/region.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage region.css
diff --git a/admin/assets/css/regions.css b/admin/assets/css/regions.css
index 33bd941..c48c998 100644
--- a/admin/assets/css/regions.css
+++ b/admin/assets/css/regions.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage regions.css
diff --git a/admin/assets/css/support_group.css b/admin/assets/css/support_group.css
index 437f47e..5a3f27e 100644
--- a/admin/assets/css/support_group.css
+++ b/admin/assets/css/support_group.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_group.css
diff --git a/admin/assets/css/support_groups.css b/admin/assets/css/support_groups.css
index e514fd8..18ded79 100644
--- a/admin/assets/css/support_groups.css
+++ b/admin/assets/css/support_groups.css
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_groups.css
diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js
index 1a31a5e..66628d9 100644
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage admin.js
diff --git a/admin/controller.php b/admin/controller.php
index 0df4504..f48420f 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage controller.php
diff --git a/admin/controllers/additional_info.php b/admin/controllers/additional_info.php
index 1c9db5c..211c46b 100644
--- a/admin/controllers/additional_info.php
+++ b/admin/controllers/additional_info.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_info.php
diff --git a/admin/controllers/additional_information.php b/admin/controllers/additional_information.php
index 437e7e9..4cd0145 100644
--- a/admin/controllers/additional_information.php
+++ b/admin/controllers/additional_information.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_information.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerAdditional_information extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Additional_information');
// get the data to export
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 6780fb7..28a2c88 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage ajax.json.php
diff --git a/admin/controllers/area.php b/admin/controllers/area.php
index 3bfe5eb..37b43fb 100644
--- a/admin/controllers/area.php
+++ b/admin/controllers/area.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area.php
diff --git a/admin/controllers/area_type.php b/admin/controllers/area_type.php
index 075a4a7..8ef94b0 100644
--- a/admin/controllers/area_type.php
+++ b/admin/controllers/area_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_type.php
diff --git a/admin/controllers/area_types.php b/admin/controllers/area_types.php
index 03a450a..7f7c0c3 100644
--- a/admin/controllers/area_types.php
+++ b/admin/controllers/area_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_types.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerArea_types extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Area_types');
// get the data to export
diff --git a/admin/controllers/areas.php b/admin/controllers/areas.php
index c450ce0..e1351ee 100644
--- a/admin/controllers/areas.php
+++ b/admin/controllers/areas.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage areas.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerAreas extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Areas');
// get the data to export
diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php
index c853ebc..4065a14 100644
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage countries.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerCountries extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Countries');
// get the data to export
diff --git a/admin/controllers/country.php b/admin/controllers/country.php
index 79b1d1f..0563c19 100644
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage country.php
diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php
index 6c1dd9e..03e555b 100644
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currencies.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerCurrencies extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Currencies');
// get the data to export
diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php
index 1426a04..46c6cfe 100644
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currency.php
diff --git a/admin/controllers/facilities.php b/admin/controllers/facilities.php
index 21008d8..47de98d 100644
--- a/admin/controllers/facilities.php
+++ b/admin/controllers/facilities.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facilities.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerFacilities extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Facilities');
// get the data to export
diff --git a/admin/controllers/facility.php b/admin/controllers/facility.php
index c6ccb1f..8136161 100644
--- a/admin/controllers/facility.php
+++ b/admin/controllers/facility.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility.php
diff --git a/admin/controllers/facility_type.php b/admin/controllers/facility_type.php
index 57171ec..1e6de43 100644
--- a/admin/controllers/facility_type.php
+++ b/admin/controllers/facility_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_type.php
diff --git a/admin/controllers/facility_types.php b/admin/controllers/facility_types.php
index c570197..c7294a8 100644
--- a/admin/controllers/facility_types.php
+++ b/admin/controllers/facility_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_types.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerFacility_types extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Facility_types');
// get the data to export
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index fa2b41a..1bfdbb0 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 2cc2d61..48497ea 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 5ec2ab7..b620472 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help_documents.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerHelp_documents extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Help_documents');
// get the data to export
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 7f7dd5d..589d60b 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage import.php
diff --git a/admin/controllers/info_type.php b/admin/controllers/info_type.php
index 315dd78..315a4d2 100644
--- a/admin/controllers/info_type.php
+++ b/admin/controllers/info_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_type.php
diff --git a/admin/controllers/info_types.php b/admin/controllers/info_types.php
index d5a5b19..cf333e7 100644
--- a/admin/controllers/info_types.php
+++ b/admin/controllers/info_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_types.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerInfo_types extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Info_types');
// get the data to export
diff --git a/admin/controllers/payment.php b/admin/controllers/payment.php
index 3798e78..e24d865 100644
--- a/admin/controllers/payment.php
+++ b/admin/controllers/payment.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payment.php
diff --git a/admin/controllers/payments.php b/admin/controllers/payments.php
index b5a7611..0a0b7b3 100644
--- a/admin/controllers/payments.php
+++ b/admin/controllers/payments.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payments.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerPayments extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Payments');
// get the data to export
diff --git a/admin/controllers/region.php b/admin/controllers/region.php
index df7a46d..9b5330f 100644
--- a/admin/controllers/region.php
+++ b/admin/controllers/region.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage region.php
diff --git a/admin/controllers/regions.php b/admin/controllers/regions.php
index e277792..a1c7770 100644
--- a/admin/controllers/regions.php
+++ b/admin/controllers/regions.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage regions.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerRegions extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Regions');
// get the data to export
diff --git a/admin/controllers/support_group.php b/admin/controllers/support_group.php
index 85661bf..a3461d2 100644
--- a/admin/controllers/support_group.php
+++ b/admin/controllers/support_group.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_group.php
diff --git a/admin/controllers/support_groups.php b/admin/controllers/support_groups.php
index d73c353..d3ec7d8 100644
--- a/admin/controllers/support_groups.php
+++ b/admin/controllers/support_groups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_groups.php
@@ -69,7 +69,7 @@ class SupportgroupsControllerSupport_groups extends JControllerAdmin
$input = JFactory::getApplication()->input;
$pks = $input->post->get('cid', array(), 'array');
// Sanitize the input
- ArrayHelper::toInteger($pks);
+ $pks = ArrayHelper::toInteger($pks);
// Get the model
$model = $this->getModel('Support_groups');
// get the data to export
diff --git a/admin/controllers/supportgroups.php b/admin/controllers/supportgroups.php
index b6fdd3c..d8d8bb0 100644
--- a/admin/controllers/supportgroups.php
+++ b/admin/controllers/supportgroups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage supportgroups.php
diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php
index 03da9b6..043e266 100644
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage headercheck.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index a180fc7..6765321 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage batch_.php
diff --git a/admin/helpers/supportgroups.php b/admin/helpers/supportgroups.php
index 634686f..29b5b8a 100644
--- a/admin/helpers/supportgroups.php
+++ b/admin/helpers/supportgroups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage supportgroups.php
@@ -26,8 +26,9 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\CMS\Language\Language;
-use Joomla\String\StringHelper;
+use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -624,6 +625,8 @@ abstract class SupportgroupsHelper
->setLastModifiedBy($modified)
->setTitle($title)
->setSubject($subjectTab);
+ // The file type
+ $file_type = 'Xls';
// set description
if ($description)
{
@@ -663,21 +666,46 @@ abstract class SupportgroupsHelper
));
// Add some data
- if (self::checkArray($rows))
+ if (($size = self::checkArray($rows)) !== false)
{
$i = 1;
- foreach ($rows as $array){
+
+ // Based on data size we adapt the behaviour.
+ $xls_mode = 1;
+ if ($size > 3000)
+ {
+ $xls_mode = 3;
+ $file_type = 'Csv';
+ }
+ elseif ($size > 2000)
+ {
+ $xls_mode = 2;
+ }
+
+ // Set active sheet and get it.
+ $active_sheet = $spreadsheet->setActiveSheetIndex(0);
+ foreach ($rows as $array)
+ {
$a = 'A';
- foreach ($array as $value){
- $spreadsheet->setActiveSheetIndex(0)->setCellValue($a.$i, $value);
- if ($i == 1){
- $spreadsheet->getActiveSheet()->getColumnDimension($a)->setAutoSize(true);
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($headerStyles);
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
- } elseif ($a === 'A'){
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($sideStyles);
- } else {
- $spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($normalStyles);
+ foreach ($array as $value)
+ {
+ $active_sheet->setCellValue($a.$i, $value);
+ if ($xls_mode != 3)
+ {
+ if ($i == 1)
+ {
+ $active_sheet->getColumnDimension($a)->setAutoSize(true);
+ $active_sheet->getStyle($a.$i)->applyFromArray($headerStyles);
+ $active_sheet->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+ }
+ elseif ($a === 'A')
+ {
+ $active_sheet->getStyle($a.$i)->applyFromArray($sideStyles);
+ }
+ elseif ($xls_mode == 1)
+ {
+ $active_sheet->getStyle($a.$i)->applyFromArray($normalStyles);
+ }
}
$a++;
}
@@ -697,7 +725,7 @@ abstract class SupportgroupsHelper
// Redirect output to a client's web browser (Excel5)
header('Content-Type: application/vnd.ms-excel');
- header('Content-Disposition: attachment;filename="'.$fileName.'.xls"');
+ header('Content-Disposition: attachment;filename="' . $fileName . '.' . strtolower($file_type) .'"');
header('Cache-Control: max-age=0');
// If you're serving to IE 9, then the following may be needed
header('Cache-Control: max-age=1');
@@ -708,7 +736,7 @@ abstract class SupportgroupsHelper
header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
header ('Pragma: public'); // HTTP/1.0
- $writer = IOFactory::createWriter($spreadsheet, 'Xls');
+ $writer = IOFactory::createWriter($spreadsheet, $file_type);
$writer->save('php://output');
jexit();
}
diff --git a/admin/language/en-GB/en-GB.com_supportgroups.ini b/admin/language/en-GB/en-GB.com_supportgroups.ini
index 78588e2..19829ea 100644
--- a/admin/language/en-GB/en-GB.com_supportgroups.ini
+++ b/admin/language/en-GB/en-GB.com_supportgroups.ini
@@ -46,6 +46,8 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_CHECKED_IN_1="%d Additional Inf
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_CHECKED_IN_MORE="%d Additional Information successfully checked in."
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_DELETED="%s Additional Information deleted."
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_DELETED_1="%s Additional Info deleted."
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_FAILED_PUBLISHING="%s Additional Information failed publishing."
+COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_FAILED_PUBLISHING_1="%s Additional Info failed publishing."
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_FEATURED="%s Additional Information featured."
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_FEATURED_1="%s Additional Info featured."
COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_PUBLISHED="%s Additional Information published."
@@ -145,6 +147,8 @@ COM_SUPPORTGROUPS_AREAS_N_ITEMS_CHECKED_IN_1="%d Area successfully checked in."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_CHECKED_IN_MORE="%d Areas successfully checked in."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_DELETED="%s Areas deleted."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_DELETED_1="%s Area deleted."
+COM_SUPPORTGROUPS_AREAS_N_ITEMS_FAILED_PUBLISHING="%s Areas failed publishing."
+COM_SUPPORTGROUPS_AREAS_N_ITEMS_FAILED_PUBLISHING_1="%s Area failed publishing."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_FEATURED="%s Areas featured."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_FEATURED_1="%s Area featured."
COM_SUPPORTGROUPS_AREAS_N_ITEMS_PUBLISHED="%s Areas published."
@@ -234,6 +238,8 @@ COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_CHECKED_IN_1="%d Area Type successfully che
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_CHECKED_IN_MORE="%d Area Types successfully checked in."
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_DELETED="%s Area Types deleted."
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_DELETED_1="%s Area Type deleted."
+COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_FAILED_PUBLISHING="%s Area Types failed publishing."
+COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_FAILED_PUBLISHING_1="%s Area Type failed publishing."
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_FEATURED="%s Area Types featured."
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_FEATURED_1="%s Area Type featured."
COM_SUPPORTGROUPS_AREA_TYPES_N_ITEMS_PUBLISHED="%s Area Types published."
@@ -415,6 +421,8 @@ COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_CHECKED_IN_1="%d Country successfully checke
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_CHECKED_IN_MORE="%d Countries successfully checked in."
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_DELETED="%s Countries deleted."
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_DELETED_1="%s Country deleted."
+COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_FAILED_PUBLISHING="%s Countries failed publishing."
+COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_FAILED_PUBLISHING_1="%s Country failed publishing."
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_FEATURED="%s Countries featured."
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_FEATURED_1="%s Country featured."
COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_PUBLISHED="%s Countries published."
@@ -520,6 +528,8 @@ COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_CHECKED_IN_1="%d Currency successfully chec
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_CHECKED_IN_MORE="%d Currencies successfully checked in."
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_DELETED="%s Currencies deleted."
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_DELETED_1="%s Currency deleted."
+COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_FAILED_PUBLISHING="%s Currencies failed publishing."
+COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_FAILED_PUBLISHING_1="%s Currency failed publishing."
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_FEATURED="%s Currencies featured."
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_FEATURED_1="%s Currency featured."
COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_PUBLISHED="%s Currencies published."
@@ -680,6 +690,8 @@ COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_CHECKED_IN_1="%d Facility successfully chec
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_CHECKED_IN_MORE="%d Facilities successfully checked in."
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_DELETED="%s Facilities deleted."
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_DELETED_1="%s Facility deleted."
+COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_FAILED_PUBLISHING="%s Facilities failed publishing."
+COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_FAILED_PUBLISHING_1="%s Facility failed publishing."
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_FEATURED="%s Facilities featured."
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_FEATURED_1="%s Facility featured."
COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_PUBLISHED="%s Facilities published."
@@ -772,6 +784,8 @@ COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_CHECKED_IN_1="%d Facility Type successf
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_CHECKED_IN_MORE="%d Facility Types successfully checked in."
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_DELETED="%s Facility Types deleted."
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_DELETED_1="%s Facility Type deleted."
+COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_FAILED_PUBLISHING="%s Facility Types failed publishing."
+COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_FAILED_PUBLISHING_1="%s Facility Type failed publishing."
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_FEATURED="%s Facility Types featured."
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_FEATURED_1="%s Facility Type featured."
COM_SUPPORTGROUPS_FACILITY_TYPES_N_ITEMS_PUBLISHED="%s Facility Types published."
@@ -845,6 +859,8 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_CHECKED_IN_1="%d Help Document successf
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_CHECKED_IN_MORE="%d Help Documents successfully checked in."
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_DELETED="%s Help Documents deleted."
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_DELETED_1="%s Help Document deleted."
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_FAILED_PUBLISHING="%s Help Documents failed publishing."
+COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_FAILED_PUBLISHING_1="%s Help Document failed publishing."
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_FEATURED="%s Help Documents featured."
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_FEATURED_1="%s Help Document featured."
COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_PUBLISHED="%s Help Documents published."
@@ -891,7 +907,6 @@ COM_SUPPORTGROUPS_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date"
COM_SUPPORTGROUPS_HELP_DOCUMENT_NEW="A New Help Document"
COM_SUPPORTGROUPS_HELP_DOCUMENT_NOT_REQUIRED="Not Required"
COM_SUPPORTGROUPS_HELP_DOCUMENT_ORDERING_LABEL="Ordering"
-COM_SUPPORTGROUPS_HELP_DOCUMENT_PERMISSION="Permissions"
COM_SUPPORTGROUPS_HELP_DOCUMENT_PUBLISHING="Publishing"
COM_SUPPORTGROUPS_HELP_DOCUMENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Help Document to customise the alias."
COM_SUPPORTGROUPS_HELP_DOCUMENT_SELECT_AN_OPTION="Select an option"
@@ -1008,6 +1023,8 @@ COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_CHECKED_IN_1="%d Info Type successfully che
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_CHECKED_IN_MORE="%d Info Types successfully checked in."
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_DELETED="%s Info Types deleted."
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_DELETED_1="%s Info Type deleted."
+COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_FAILED_PUBLISHING="%s Info Types failed publishing."
+COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_FAILED_PUBLISHING_1="%s Info Type failed publishing."
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_FEATURED="%s Info Types featured."
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_FEATURED_1="%s Info Type featured."
COM_SUPPORTGROUPS_INFO_TYPES_N_ITEMS_PUBLISHED="%s Info Types published."
@@ -1101,6 +1118,8 @@ COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_CHECKED_IN_1="%d Payment successfully checked
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_CHECKED_IN_MORE="%d Payments successfully checked in."
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_DELETED="%s Payments deleted."
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_DELETED_1="%s Payment deleted."
+COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_FAILED_PUBLISHING="%s Payments failed publishing."
+COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_FAILED_PUBLISHING_1="%s Payment failed publishing."
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_FEATURED="%s Payments featured."
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_FEATURED_1="%s Payment featured."
COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_PUBLISHED="%s Payments published."
@@ -1219,6 +1238,8 @@ COM_SUPPORTGROUPS_REGIONS_N_ITEMS_CHECKED_IN_1="%d Region successfully checked i
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_CHECKED_IN_MORE="%d Regions successfully checked in."
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_DELETED="%s Regions deleted."
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_DELETED_1="%s Region deleted."
+COM_SUPPORTGROUPS_REGIONS_N_ITEMS_FAILED_PUBLISHING="%s Regions failed publishing."
+COM_SUPPORTGROUPS_REGIONS_N_ITEMS_FAILED_PUBLISHING_1="%s Region failed publishing."
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_FEATURED="%s Regions featured."
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_FEATURED_1="%s Region featured."
COM_SUPPORTGROUPS_REGIONS_N_ITEMS_PUBLISHED="%s Regions published."
@@ -1346,6 +1367,8 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_CHECKED_IN_1="%d Support Group successf
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_CHECKED_IN_MORE="%d Support Groups successfully checked in."
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_DELETED="%s Support Groups deleted."
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_DELETED_1="%s Support Group deleted."
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_FAILED_PUBLISHING="%s Support Groups failed publishing."
+COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_FAILED_PUBLISHING_1="%s Support Group failed publishing."
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_FEATURED="%s Support Groups featured."
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_FEATURED_1="%s Support Group featured."
COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_PUBLISHED="%s Support Groups published."
diff --git a/admin/layouts/additional_info/metadata.php b/admin/layouts/additional_info/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/additional_info/metadata.php
+++ b/admin/layouts/additional_info/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/additional_info/publishing.php b/admin/layouts/additional_info/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/additional_info/publishing.php
+++ b/admin/layouts/additional_info/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/additional_info/settings_above.php b/admin/layouts/additional_info/settings_above.php
index b59554f..8d46386 100644
--- a/admin/layouts/additional_info/settings_above.php
+++ b/admin/layouts/additional_info/settings_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_above.php
diff --git a/admin/layouts/additional_info/settings_fullwidth.php b/admin/layouts/additional_info/settings_fullwidth.php
index 5a7b8a0..b83236c 100644
--- a/admin/layouts/additional_info/settings_fullwidth.php
+++ b/admin/layouts/additional_info/settings_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_fullwidth.php
diff --git a/admin/layouts/additional_info/settings_left.php b/admin/layouts/additional_info/settings_left.php
index 78da7a5..c4e68b2 100644
--- a/admin/layouts/additional_info/settings_left.php
+++ b/admin/layouts/additional_info/settings_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_left.php
diff --git a/admin/layouts/additional_info/support_groups_fullwidth.php b/admin/layouts/additional_info/support_groups_fullwidth.php
index 98fa663..8104e2e 100644
--- a/admin/layouts/additional_info/support_groups_fullwidth.php
+++ b/admin/layouts/additional_info/support_groups_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_groups_fullwidth.php
@@ -124,25 +124,25 @@ else
escape($item->female); ?>
|
- published == 1):?>
+ published == 1): ?>
|
- published == 0):?>
+ published == 0): ?>
|
- published == 2):?>
+ published == 2): ?>
|
- published == -2):?>
+ published == -2): ?>
diff --git a/admin/layouts/area/metadata.php b/admin/layouts/area/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/area/metadata.php
+++ b/admin/layouts/area/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/area/publishing.php b/admin/layouts/area/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/area/publishing.php
+++ b/admin/layouts/area/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/area/settings_above.php b/admin/layouts/area/settings_above.php
index 4648897..e2e0628 100644
--- a/admin/layouts/area/settings_above.php
+++ b/admin/layouts/area/settings_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_above.php
diff --git a/admin/layouts/area/settings_fullwidth.php b/admin/layouts/area/settings_fullwidth.php
index 5a7b8a0..b83236c 100644
--- a/admin/layouts/area/settings_fullwidth.php
+++ b/admin/layouts/area/settings_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_fullwidth.php
diff --git a/admin/layouts/area/settings_left.php b/admin/layouts/area/settings_left.php
index 8b84aef..c9bfd55 100644
--- a/admin/layouts/area/settings_left.php
+++ b/admin/layouts/area/settings_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_left.php
diff --git a/admin/layouts/area/settings_right.php b/admin/layouts/area/settings_right.php
index 2a87092..40d5671 100644
--- a/admin/layouts/area/settings_right.php
+++ b/admin/layouts/area/settings_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_right.php
diff --git a/admin/layouts/area/support_groups_fullwidth.php b/admin/layouts/area/support_groups_fullwidth.php
index 5cdc38e..f822651 100644
--- a/admin/layouts/area/support_groups_fullwidth.php
+++ b/admin/layouts/area/support_groups_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_groups_fullwidth.php
@@ -127,25 +127,25 @@ $can = SupportgroupsHelper::getActions('support_group');
|
escape($item->female); ?>
|
- published == 1):?>
+ published == 1): ?>
|
- published == 0):?>
+ published == 0): ?>
|
- published == 2):?>
+ published == 2): ?>
|
- published == -2):?>
+ published == -2): ?>
diff --git a/admin/layouts/area_type/details_left.php b/admin/layouts/area_type/details_left.php
index 913f173..75fae68 100644
--- a/admin/layouts/area_type/details_left.php
+++ b/admin/layouts/area_type/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/area_type/details_right.php b/admin/layouts/area_type/details_right.php
index 9529368..fb57780 100644
--- a/admin/layouts/area_type/details_right.php
+++ b/admin/layouts/area_type/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/area_type/publishing.php b/admin/layouts/area_type/publishing.php
index 1bd0eec..1c1b703 100644
--- a/admin/layouts/area_type/publishing.php
+++ b/admin/layouts/area_type/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/area_type/publlshing.php b/admin/layouts/area_type/publlshing.php
index 9c9916a..06bf2f7 100644
--- a/admin/layouts/area_type/publlshing.php
+++ b/admin/layouts/area_type/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publlshing.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 43a3b62..67eb203 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage batchselection.php
diff --git a/admin/layouts/country/metadata.php b/admin/layouts/country/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/country/metadata.php
+++ b/admin/layouts/country/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/country/regions_fullwidth.php b/admin/layouts/country/regions_fullwidth.php
index d5ccdb8..82bbf24 100644
--- a/admin/layouts/country/regions_fullwidth.php
+++ b/admin/layouts/country/regions_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage regions_fullwidth.php
@@ -104,25 +104,25 @@ $can = SupportgroupsHelper::getActions('region');
|
escape($item->country_name); ?>
|
- published == 1):?>
+ published == 1): ?>
|
- published == 0):?>
+ published == 0): ?>
|
- published == 2):?>
+ published == 2): ?>
|
- published == -2):?>
+ published == -2): ?>
diff --git a/admin/layouts/country/settings_above.php b/admin/layouts/country/settings_above.php
index b59554f..8d46386 100644
--- a/admin/layouts/country/settings_above.php
+++ b/admin/layouts/country/settings_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_above.php
diff --git a/admin/layouts/country/settings_left.php b/admin/layouts/country/settings_left.php
index 1f074d7..a2f19c0 100644
--- a/admin/layouts/country/settings_left.php
+++ b/admin/layouts/country/settings_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_left.php
diff --git a/admin/layouts/country/settings_right.php b/admin/layouts/country/settings_right.php
index 3561b30..db4cfdc 100644
--- a/admin/layouts/country/settings_right.php
+++ b/admin/layouts/country/settings_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_right.php
diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php
index e5d221d..e5dc24c 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_above.php
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index 554a8d8..053b349 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index b093df7..644a444 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/currency/metadata.php b/admin/layouts/currency/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/currency/metadata.php
+++ b/admin/layouts/currency/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/facility/location_fullwidth.php b/admin/layouts/facility/location_fullwidth.php
index a27ba73..9a7195d 100644
--- a/admin/layouts/facility/location_fullwidth.php
+++ b/admin/layouts/facility/location_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage location_fullwidth.php
diff --git a/admin/layouts/facility/metadata.php b/admin/layouts/facility/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/facility/metadata.php
+++ b/admin/layouts/facility/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/facility/publishing.php b/admin/layouts/facility/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/facility/publishing.php
+++ b/admin/layouts/facility/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/facility/settings_above.php b/admin/layouts/facility/settings_above.php
index b59554f..8d46386 100644
--- a/admin/layouts/facility/settings_above.php
+++ b/admin/layouts/facility/settings_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_above.php
diff --git a/admin/layouts/facility/settings_fullwidth.php b/admin/layouts/facility/settings_fullwidth.php
index 5a7b8a0..b83236c 100644
--- a/admin/layouts/facility/settings_fullwidth.php
+++ b/admin/layouts/facility/settings_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_fullwidth.php
diff --git a/admin/layouts/facility/settings_left.php b/admin/layouts/facility/settings_left.php
index 4b7ee9b..de7e2f5 100644
--- a/admin/layouts/facility/settings_left.php
+++ b/admin/layouts/facility/settings_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_left.php
diff --git a/admin/layouts/facility/settings_right.php b/admin/layouts/facility/settings_right.php
index 5daa7d1..a73dab7 100644
--- a/admin/layouts/facility/settings_right.php
+++ b/admin/layouts/facility/settings_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_right.php
diff --git a/admin/layouts/facility/settings_under.php b/admin/layouts/facility/settings_under.php
index 63db2d2..1e4d266 100644
--- a/admin/layouts/facility/settings_under.php
+++ b/admin/layouts/facility/settings_under.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage settings_under.php
diff --git a/admin/layouts/facility_type/details_left.php b/admin/layouts/facility_type/details_left.php
index 913f173..75fae68 100644
--- a/admin/layouts/facility_type/details_left.php
+++ b/admin/layouts/facility_type/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/facility_type/details_right.php b/admin/layouts/facility_type/details_right.php
index 9529368..fb57780 100644
--- a/admin/layouts/facility_type/details_right.php
+++ b/admin/layouts/facility_type/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/facility_type/publishing.php b/admin/layouts/facility_type/publishing.php
index 1bd0eec..1c1b703 100644
--- a/admin/layouts/facility_type/publishing.php
+++ b/admin/layouts/facility_type/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/facility_type/publlshing.php b/admin/layouts/facility_type/publlshing.php
index 9c9916a..06bf2f7 100644
--- a/admin/layouts/facility_type/publlshing.php
+++ b/admin/layouts/facility_type/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publlshing.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 897ab87..a240c3d 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index b8f9939..b793ed5 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index d26b0da..82989c2 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 507e257..e2a857b 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 32222e5..358d792 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 1bd0eec..c5fcf03 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index 9c9916a..06bf2f7 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publlshing.php
diff --git a/admin/layouts/info_type/details_left.php b/admin/layouts/info_type/details_left.php
index 913f173..75fae68 100644
--- a/admin/layouts/info_type/details_left.php
+++ b/admin/layouts/info_type/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/info_type/details_right.php b/admin/layouts/info_type/details_right.php
index 9529368..fb57780 100644
--- a/admin/layouts/info_type/details_right.php
+++ b/admin/layouts/info_type/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/info_type/publishing.php b/admin/layouts/info_type/publishing.php
index 1bd0eec..1c1b703 100644
--- a/admin/layouts/info_type/publishing.php
+++ b/admin/layouts/info_type/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/info_type/publlshing.php b/admin/layouts/info_type/publlshing.php
index 9c9916a..06bf2f7 100644
--- a/admin/layouts/info_type/publlshing.php
+++ b/admin/layouts/info_type/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publlshing.php
diff --git a/admin/layouts/payment/details_above.php b/admin/layouts/payment/details_above.php
index 5211e7f..82ab67a 100644
--- a/admin/layouts/payment/details_above.php
+++ b/admin/layouts/payment/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_above.php
diff --git a/admin/layouts/payment/details_left.php b/admin/layouts/payment/details_left.php
index 5617276..6cc37d8 100644
--- a/admin/layouts/payment/details_left.php
+++ b/admin/layouts/payment/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/payment/details_right.php b/admin/layouts/payment/details_right.php
index 08fdda8..7a004e5 100644
--- a/admin/layouts/payment/details_right.php
+++ b/admin/layouts/payment/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/payment/publishing.php b/admin/layouts/payment/publishing.php
index 1bd0eec..1c1b703 100644
--- a/admin/layouts/payment/publishing.php
+++ b/admin/layouts/payment/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/payment/publlshing.php b/admin/layouts/payment/publlshing.php
index 9c9916a..06bf2f7 100644
--- a/admin/layouts/payment/publlshing.php
+++ b/admin/layouts/payment/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publlshing.php
diff --git a/admin/layouts/region/details_above.php b/admin/layouts/region/details_above.php
index e5d221d..e5dc24c 100644
--- a/admin/layouts/region/details_above.php
+++ b/admin/layouts/region/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_above.php
diff --git a/admin/layouts/region/details_right.php b/admin/layouts/region/details_right.php
index 2bf854f..57607c7 100644
--- a/admin/layouts/region/details_right.php
+++ b/admin/layouts/region/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/region/metadata.php b/admin/layouts/region/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/region/metadata.php
+++ b/admin/layouts/region/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/region/publishing.php b/admin/layouts/region/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/region/publishing.php
+++ b/admin/layouts/region/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/layouts/support_group/details_above.php b/admin/layouts/support_group/details_above.php
index e5d221d..e5dc24c 100644
--- a/admin/layouts/support_group/details_above.php
+++ b/admin/layouts/support_group/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_above.php
diff --git a/admin/layouts/support_group/details_fullwidth.php b/admin/layouts/support_group/details_fullwidth.php
index 851dc4b..bc3216d 100644
--- a/admin/layouts/support_group/details_fullwidth.php
+++ b/admin/layouts/support_group/details_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_fullwidth.php
diff --git a/admin/layouts/support_group/details_left.php b/admin/layouts/support_group/details_left.php
index b2e89e5..4ae5e33 100644
--- a/admin/layouts/support_group/details_left.php
+++ b/admin/layouts/support_group/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_left.php
diff --git a/admin/layouts/support_group/details_right.php b/admin/layouts/support_group/details_right.php
index 4a66346..35372e9 100644
--- a/admin/layouts/support_group/details_right.php
+++ b/admin/layouts/support_group/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_right.php
diff --git a/admin/layouts/support_group/details_under.php b/admin/layouts/support_group/details_under.php
index e7335e1..367038a 100644
--- a/admin/layouts/support_group/details_under.php
+++ b/admin/layouts/support_group/details_under.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage details_under.php
diff --git a/admin/layouts/support_group/location_fullwidth.php b/admin/layouts/support_group/location_fullwidth.php
index a27ba73..9a7195d 100644
--- a/admin/layouts/support_group/location_fullwidth.php
+++ b/admin/layouts/support_group/location_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage location_fullwidth.php
diff --git a/admin/layouts/support_group/location_left.php b/admin/layouts/support_group/location_left.php
index 8eb53e2..f402f49 100644
--- a/admin/layouts/support_group/location_left.php
+++ b/admin/layouts/support_group/location_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage location_left.php
diff --git a/admin/layouts/support_group/metadata.php b/admin/layouts/support_group/metadata.php
index d81e5d1..930c1d8 100644
--- a/admin/layouts/support_group/metadata.php
+++ b/admin/layouts/support_group/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage metadata.php
diff --git a/admin/layouts/support_group/payments_fullwidth.php b/admin/layouts/support_group/payments_fullwidth.php
index 5781dc0..1ce0fbf 100644
--- a/admin/layouts/support_group/payments_fullwidth.php
+++ b/admin/layouts/support_group/payments_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payments_fullwidth.php
@@ -98,25 +98,25 @@ $can = SupportgroupsHelper::getActions('payment');
|
escape($item->amount); ?>
|
- published == 1):?>
+ published == 1): ?>
|
- published == 0):?>
+ published == 0): ?>
|
- published == 2):?>
+ published == 2): ?>
|
- published == -2):?>
+ published == -2): ?>
diff --git a/admin/layouts/support_group/publishing.php b/admin/layouts/support_group/publishing.php
index bdc034f..5bd6a45 100644
--- a/admin/layouts/support_group/publishing.php
+++ b/admin/layouts/support_group/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage publishing.php
@@ -40,6 +40,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
// get the fields
$fields = $displayData->get($fields_tab_layout) ?: array(
+ 'title',
'created',
'created_by',
'modified',
diff --git a/admin/models/additional_info.php b/admin/models/additional_info.php
index 71a10fd..b80d526 100644
--- a/admin/models/additional_info.php
+++ b/admin/models/additional_info.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_info.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
@@ -159,9 +159,17 @@ class SupportgroupsModelAdditional_info extends JModelAdmin
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
diff --git a/admin/models/additional_information.php b/admin/models/additional_information.php
index 29845a0..c2581f0 100644
--- a/admin/models/additional_information.php
+++ b/admin/models/additional_information.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_information.php
@@ -40,21 +40,28 @@ class SupportgroupsModelAdditional_information extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
- 'a.name','name',
- 'g.name'
+ 'g.name','info_type',
+ 'a.name','name'
);
}
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -64,30 +71,31 @@ class SupportgroupsModelAdditional_information extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$info_type = $this->getUserStateFromRequest($this->context . '.filter.info_type', 'filter_info_type');
- $this->setState('filter.info_type', $info_type);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
+ $this->setState('filter.info_type', $info_type);
+
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
// List state information.
parent::populateState($ordering, $direction);
@@ -169,9 +177,17 @@ class SupportgroupsModelAdditional_information extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -194,15 +210,27 @@ class SupportgroupsModelAdditional_information extends JModelList
}
}
- // Filter by info_type.
- if ($info_type = $this->getState('filter.info_type'))
+ // Filter by Info_type.
+ $_info_type = $this->getState('filter.info_type');
+ if (is_numeric($_info_type))
{
- $query->where('a.info_type = ' . $db->quote($db->escape($info_type)));
+ if (is_float($_info_type))
+ {
+ $query->where('a.info_type = ' . (float) $_info_type);
+ }
+ else
+ {
+ $query->where('a.info_type = ' . (int) $_info_type);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_info_type))
+ {
+ $query->where('a.info_type = ' . $db->quote($db->escape($_info_type)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -222,7 +250,7 @@ class SupportgroupsModelAdditional_information extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -240,7 +268,24 @@ class SupportgroupsModelAdditional_information extends JModelList
// From the supportgroups_additional_info table
$query->from($db->quoteName('#__supportgroups_additional_info', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -328,11 +373,12 @@ class SupportgroupsModelAdditional_information extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
- $id .= ':' . $this->getState('filter.info_type');
+ $id .= ':' . $this->getState('filter.info_type');
+ $id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index d52274e..9720f2a 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage ajax.php
diff --git a/admin/models/area.php b/admin/models/area.php
index ff2f73b..8f9e255 100644
--- a/admin/models/area.php
+++ b/admin/models/area.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
@@ -178,9 +178,17 @@ class SupportgroupsModelArea extends JModelAdmin
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
diff --git a/admin/models/area_type.php b/admin/models/area_type.php
index 3542dc7..56e71d5 100644
--- a/admin/models/area_type.php
+++ b/admin/models/area_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_type.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/area_types.php b/admin/models/area_types.php
index 1d95c5b..415e919 100644
--- a/admin/models/area_types.php
+++ b/admin/models/area_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_types.php
@@ -40,6 +40,7 @@ class SupportgroupsModelArea_types extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
@@ -49,11 +50,17 @@ class SupportgroupsModelArea_types extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -63,27 +70,28 @@ class SupportgroupsModelArea_types extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
$this->setState('filter.name', $name);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -161,9 +169,17 @@ class SupportgroupsModelArea_types extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -189,7 +205,7 @@ class SupportgroupsModelArea_types extends JModelList
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -209,7 +225,7 @@ class SupportgroupsModelArea_types extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -227,7 +243,24 @@ class SupportgroupsModelArea_types extends JModelList
// From the supportgroups_area_type table
$query->from($db->quoteName('#__supportgroups_area_type', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -315,6 +348,7 @@ class SupportgroupsModelArea_types extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
diff --git a/admin/models/areas.php b/admin/models/areas.php
index 39126b8..6900a50 100644
--- a/admin/models/areas.php
+++ b/admin/models/areas.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage areas.php
@@ -40,22 +40,29 @@ class SupportgroupsModelAreas extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
- 'a.name','name',
- 'g.name',
- 'h.name'
+ 'g.name','area_type',
+ 'h.name','region',
+ 'a.name','name'
);
}
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -65,33 +72,34 @@ class SupportgroupsModelAreas extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$area_type = $this->getUserStateFromRequest($this->context . '.filter.area_type', 'filter_area_type');
$this->setState('filter.area_type', $area_type);
$region = $this->getUserStateFromRequest($this->context . '.filter.region', 'filter_region');
- $this->setState('filter.region', $region);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
+ $this->setState('filter.region', $region);
+
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
// List state information.
parent::populateState($ordering, $direction);
@@ -186,9 +194,17 @@ class SupportgroupsModelAreas extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -211,20 +227,44 @@ class SupportgroupsModelAreas extends JModelList
}
}
- // Filter by area_type.
- if ($area_type = $this->getState('filter.area_type'))
+ // Filter by Area_type.
+ $_area_type = $this->getState('filter.area_type');
+ if (is_numeric($_area_type))
{
- $query->where('a.area_type = ' . $db->quote($db->escape($area_type)));
+ if (is_float($_area_type))
+ {
+ $query->where('a.area_type = ' . (float) $_area_type);
+ }
+ else
+ {
+ $query->where('a.area_type = ' . (int) $_area_type);
+ }
}
- // Filter by region.
- if ($region = $this->getState('filter.region'))
+ elseif (SupportgroupsHelper::checkString($_area_type))
{
- $query->where('a.region = ' . $db->quote($db->escape($region)));
+ $query->where('a.area_type = ' . $db->quote($db->escape($_area_type)));
+ }
+ // Filter by Region.
+ $_region = $this->getState('filter.region');
+ if (is_numeric($_region))
+ {
+ if (is_float($_region))
+ {
+ $query->where('a.region = ' . (float) $_region);
+ }
+ else
+ {
+ $query->where('a.region = ' . (int) $_region);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_region))
+ {
+ $query->where('a.region = ' . $db->quote($db->escape($_region)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -244,7 +284,7 @@ class SupportgroupsModelAreas extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -262,7 +302,24 @@ class SupportgroupsModelAreas extends JModelList
// From the supportgroups_area table
$query->from($db->quoteName('#__supportgroups_area', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -359,12 +416,13 @@ class SupportgroupsModelAreas extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.area_type');
- $id .= ':' . $this->getState('filter.region');
+ $id .= ':' . $this->getState('filter.region');
+ $id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}
diff --git a/admin/models/countries.php b/admin/models/countries.php
index 433fe6b..45ff508 100644
--- a/admin/models/countries.php
+++ b/admin/models/countries.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage countries.php
@@ -40,12 +40,13 @@ class SupportgroupsModelCountries extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
- 'a.name','name',
- 'g.name',
+ 'g.name','currency',
'a.worldzone','worldzone',
+ 'a.name','name',
'a.codethree','codethree',
'a.codetwo','codetwo'
);
@@ -53,11 +54,17 @@ class SupportgroupsModelCountries extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -67,9 +74,25 @@ class SupportgroupsModelCountries extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$currency = $this->getUserStateFromRequest($this->context . '.filter.currency', 'filter_currency');
$this->setState('filter.currency', $currency);
@@ -77,29 +100,14 @@ class SupportgroupsModelCountries extends JModelList
$worldzone = $this->getUserStateFromRequest($this->context . '.filter.worldzone', 'filter_worldzone');
$this->setState('filter.worldzone', $worldzone);
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
+
$codethree = $this->getUserStateFromRequest($this->context . '.filter.codethree', 'filter_codethree');
$this->setState('filter.codethree', $codethree);
$codetwo = $this->getUserStateFromRequest($this->context . '.filter.codetwo', 'filter_codetwo');
$this->setState('filter.codetwo', $codetwo);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -181,9 +189,17 @@ class SupportgroupsModelCountries extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -206,20 +222,44 @@ class SupportgroupsModelCountries extends JModelList
}
}
- // Filter by currency.
- if ($currency = $this->getState('filter.currency'))
+ // Filter by Currency.
+ $_currency = $this->getState('filter.currency');
+ if (is_numeric($_currency))
{
- $query->where('a.currency = ' . $db->quote($db->escape($currency)));
+ if (is_float($_currency))
+ {
+ $query->where('a.currency = ' . (float) $_currency);
+ }
+ else
+ {
+ $query->where('a.currency = ' . (int) $_currency);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_currency))
+ {
+ $query->where('a.currency = ' . $db->quote($db->escape($_currency)));
}
// Filter by Worldzone.
- if ($worldzone = $this->getState('filter.worldzone'))
+ $_worldzone = $this->getState('filter.worldzone');
+ if (is_numeric($_worldzone))
{
- $query->where('a.worldzone = ' . $db->quote($db->escape($worldzone)));
+ if (is_float($_worldzone))
+ {
+ $query->where('a.worldzone = ' . (float) $_worldzone);
+ }
+ else
+ {
+ $query->where('a.worldzone = ' . (int) $_worldzone);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_worldzone))
+ {
+ $query->where('a.worldzone = ' . $db->quote($db->escape($_worldzone)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -239,7 +279,7 @@ class SupportgroupsModelCountries extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -257,7 +297,24 @@ class SupportgroupsModelCountries extends JModelList
// From the supportgroups_country table
$query->from($db->quoteName('#__supportgroups_country', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -345,12 +402,13 @@ class SupportgroupsModelCountries extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.currency');
$id .= ':' . $this->getState('filter.worldzone');
+ $id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.codethree');
$id .= ':' . $this->getState('filter.codetwo');
diff --git a/admin/models/country.php b/admin/models/country.php
index 0a3e8b0..42bacd4 100644
--- a/admin/models/country.php
+++ b/admin/models/country.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage country.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
@@ -172,9 +172,17 @@ class SupportgroupsModelCountry extends JModelAdmin
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
diff --git a/admin/models/currencies.php b/admin/models/currencies.php
index d6da27a..6e83984 100644
--- a/admin/models/currencies.php
+++ b/admin/models/currencies.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currencies.php
@@ -40,6 +40,7 @@ class SupportgroupsModelCurrencies extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
@@ -52,11 +53,17 @@ class SupportgroupsModelCurrencies extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -66,7 +73,26 @@ class SupportgroupsModelCurrencies extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
$this->setState('filter.name', $name);
@@ -78,24 +104,6 @@ class SupportgroupsModelCurrencies extends JModelList
$decimalplace = $this->getUserStateFromRequest($this->context . '.filter.decimalplace', 'filter_decimalplace');
$this->setState('filter.decimalplace', $decimalplace);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -173,9 +181,17 @@ class SupportgroupsModelCurrencies extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -201,7 +217,7 @@ class SupportgroupsModelCurrencies extends JModelList
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -221,7 +237,7 @@ class SupportgroupsModelCurrencies extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -239,7 +255,24 @@ class SupportgroupsModelCurrencies extends JModelList
// From the supportgroups_currency table
$query->from($db->quoteName('#__supportgroups_currency', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -327,6 +360,7 @@ class SupportgroupsModelCurrencies extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
diff --git a/admin/models/currency.php b/admin/models/currency.php
index 97ca435..c3d8b21 100644
--- a/admin/models/currency.php
+++ b/admin/models/currency.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currency.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/facilities.php b/admin/models/facilities.php
index c101af5..7142b87 100644
--- a/admin/models/facilities.php
+++ b/admin/models/facilities.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facilities.php
@@ -40,11 +40,12 @@ class SupportgroupsModelFacilities extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
+ 'g.name','facility_type',
'a.name','name',
- 'g.name',
'a.phone','phone',
'a.details','details'
);
@@ -52,11 +53,17 @@ class SupportgroupsModelFacilities extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -66,36 +73,37 @@ class SupportgroupsModelFacilities extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$facility_type = $this->getUserStateFromRequest($this->context . '.filter.facility_type', 'filter_facility_type');
$this->setState('filter.facility_type', $facility_type);
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
+
$phone = $this->getUserStateFromRequest($this->context . '.filter.phone', 'filter_phone');
$this->setState('filter.phone', $phone);
$details = $this->getUserStateFromRequest($this->context . '.filter.details', 'filter_details');
$this->setState('filter.details', $details);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -177,9 +185,17 @@ class SupportgroupsModelFacilities extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -202,15 +218,27 @@ class SupportgroupsModelFacilities extends JModelList
}
}
- // Filter by facility_type.
- if ($facility_type = $this->getState('filter.facility_type'))
+ // Filter by Facility_type.
+ $_facility_type = $this->getState('filter.facility_type');
+ if (is_numeric($_facility_type))
{
- $query->where('a.facility_type = ' . $db->quote($db->escape($facility_type)));
+ if (is_float($_facility_type))
+ {
+ $query->where('a.facility_type = ' . (float) $_facility_type);
+ }
+ else
+ {
+ $query->where('a.facility_type = ' . (int) $_facility_type);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_facility_type))
+ {
+ $query->where('a.facility_type = ' . $db->quote($db->escape($_facility_type)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -230,7 +258,7 @@ class SupportgroupsModelFacilities extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -248,7 +276,24 @@ class SupportgroupsModelFacilities extends JModelList
// From the supportgroups_facility table
$query->from($db->quoteName('#__supportgroups_facility', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -336,11 +381,12 @@ class SupportgroupsModelFacilities extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.facility_type');
+ $id .= ':' . $this->getState('filter.name');
$id .= ':' . $this->getState('filter.phone');
$id .= ':' . $this->getState('filter.details');
diff --git a/admin/models/facility.php b/admin/models/facility.php
index 5f2aada..6c122cf 100644
--- a/admin/models/facility.php
+++ b/admin/models/facility.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/facility_type.php b/admin/models/facility_type.php
index eca708e..b69cccc 100644
--- a/admin/models/facility_type.php
+++ b/admin/models/facility_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_type.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/facility_types.php b/admin/models/facility_types.php
index fc2fd7e..8414985 100644
--- a/admin/models/facility_types.php
+++ b/admin/models/facility_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_types.php
@@ -40,6 +40,7 @@ class SupportgroupsModelFacility_types extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
@@ -49,11 +50,17 @@ class SupportgroupsModelFacility_types extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -63,27 +70,28 @@ class SupportgroupsModelFacility_types extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
$this->setState('filter.name', $name);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -161,9 +169,17 @@ class SupportgroupsModelFacility_types extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -189,7 +205,7 @@ class SupportgroupsModelFacility_types extends JModelList
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -209,7 +225,7 @@ class SupportgroupsModelFacility_types extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -227,7 +243,24 @@ class SupportgroupsModelFacility_types extends JModelList
// From the supportgroups_facility_type table
$query->from($db->quoteName('#__supportgroups_facility_type', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -315,6 +348,7 @@ class SupportgroupsModelFacility_types extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
diff --git a/admin/models/fields/additionalinfo.php b/admin/models/fields/additionalinfo.php
index 184bc8f..2b37958 100644
--- a/admin/models/fields/additionalinfo.php
+++ b/admin/models/fields/additionalinfo.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additionalinfo.php
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index 0c69d99..84746f5 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage adminviewfolderlist.php
diff --git a/admin/models/fields/areas.php b/admin/models/fields/areas.php
index ec82014..653c573 100644
--- a/admin/models/fields/areas.php
+++ b/admin/models/fields/areas.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage areas.php
diff --git a/admin/models/fields/areastype.php b/admin/models/fields/areastype.php
index 4667f8e..073f253 100644
--- a/admin/models/fields/areastype.php
+++ b/admin/models/fields/areastype.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage areastype.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index b72992f..59f9d6c 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage articles.php
diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php
index 17e2195..e60eb2c 100644
--- a/admin/models/fields/countries.php
+++ b/admin/models/fields/countries.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage countries.php
diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php
index ec587e2..2a74d4b 100644
--- a/admin/models/fields/currency.php
+++ b/admin/models/fields/currency.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currency.php
diff --git a/admin/models/fields/facilities.php b/admin/models/fields/facilities.php
index b0a0818..f0b65e3 100644
--- a/admin/models/fields/facilities.php
+++ b/admin/models/fields/facilities.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facilities.php
diff --git a/admin/models/fields/facilitiestype.php b/admin/models/fields/facilitiestype.php
index 16bad45..deee128 100644
--- a/admin/models/fields/facilitiestype.php
+++ b/admin/models/fields/facilitiestype.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facilitiestype.php
diff --git a/admin/models/fields/infotype.php b/admin/models/fields/infotype.php
index 3be1cd0..42aa2d8 100644
--- a/admin/models/fields/infotype.php
+++ b/admin/models/fields/infotype.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage infotype.php
diff --git a/admin/models/fields/regions.php b/admin/models/fields/regions.php
index 33e6285..4f572ac 100644
--- a/admin/models/fields/regions.php
+++ b/admin/models/fields/regions.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage regions.php
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index 543c845..c0ecf00 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage siteviewfolderlist.php
diff --git a/admin/models/fields/supportgroups.php b/admin/models/fields/supportgroups.php
index 91d2d5e..ae21fd8 100644
--- a/admin/models/fields/supportgroups.php
+++ b/admin/models/fields/supportgroups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage supportgroups.php
diff --git a/admin/models/forms/additional_info.js b/admin/models/forms/additional_info.js
index 7de96fa..5bfa6ac 100644
--- a/admin/models/forms/additional_info.js
+++ b/admin/models/forms/additional_info.js
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_info.js
diff --git a/admin/models/forms/additional_info.xml b/admin/models/forms/additional_info.xml
index 0e7e11d..007bde0 100644
--- a/admin/models/forms/additional_info.xml
+++ b/admin/models/forms/additional_info.xml
@@ -102,6 +102,14 @@
rows="3"
cols="30"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $title = $this->getUserStateFromRequest($this->context . '.filter.title', 'filter_title');
- $this->setState('filter.title', $title);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
$this->setState('filter.type', $type);
@@ -81,25 +104,10 @@ class SupportgroupsModelHelp_documents extends JModelList
$this->setState('filter.admin_view', $admin_view);
$site_view = $this->getUserStateFromRequest($this->context . '.filter.site_view', 'filter_site_view');
- $this->setState('filter.site_view', $site_view);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
+ $this->setState('filter.site_view', $site_view);
+
+ $title = $this->getUserStateFromRequest($this->context . '.filter.title', 'filter_title');
+ $this->setState('filter.title', $title);
// List state information.
parent::populateState($ordering, $direction);
@@ -239,9 +247,17 @@ class SupportgroupsModelHelp_documents extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -265,29 +281,77 @@ class SupportgroupsModelHelp_documents extends JModelList
}
// Filter by Type.
- if ($type = $this->getState('filter.type'))
+ $_type = $this->getState('filter.type');
+ if (is_numeric($_type))
{
- $query->where('a.type = ' . $db->quote($db->escape($type)));
+ if (is_float($_type))
+ {
+ $query->where('a.type = ' . (float) $_type);
+ }
+ else
+ {
+ $query->where('a.type = ' . (int) $_type);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_type))
+ {
+ $query->where('a.type = ' . $db->quote($db->escape($_type)));
}
// Filter by Location.
- if ($location = $this->getState('filter.location'))
+ $_location = $this->getState('filter.location');
+ if (is_numeric($_location))
{
- $query->where('a.location = ' . $db->quote($db->escape($location)));
+ if (is_float($_location))
+ {
+ $query->where('a.location = ' . (float) $_location);
+ }
+ else
+ {
+ $query->where('a.location = ' . (int) $_location);
+ }
}
- // Filter by admin_view.
- if ($admin_view = $this->getState('filter.admin_view'))
+ elseif (SupportgroupsHelper::checkString($_location))
{
- $query->where('a.admin_view = ' . $db->quote($db->escape($admin_view)));
+ $query->where('a.location = ' . $db->quote($db->escape($_location)));
}
- // Filter by site_view.
- if ($site_view = $this->getState('filter.site_view'))
+ // Filter by Admin_view.
+ $_admin_view = $this->getState('filter.admin_view');
+ if (is_numeric($_admin_view))
{
- $query->where('a.site_view = ' . $db->quote($db->escape($site_view)));
+ if (is_float($_admin_view))
+ {
+ $query->where('a.admin_view = ' . (float) $_admin_view);
+ }
+ else
+ {
+ $query->where('a.admin_view = ' . (int) $_admin_view);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_admin_view))
+ {
+ $query->where('a.admin_view = ' . $db->quote($db->escape($_admin_view)));
+ }
+ // Filter by Site_view.
+ $_site_view = $this->getState('filter.site_view');
+ if (is_numeric($_site_view))
+ {
+ if (is_float($_site_view))
+ {
+ $query->where('a.site_view = ' . (float) $_site_view);
+ }
+ else
+ {
+ $query->where('a.site_view = ' . (int) $_site_view);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_site_view))
+ {
+ $query->where('a.site_view = ' . $db->quote($db->escape($_site_view)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -307,7 +371,7 @@ class SupportgroupsModelHelp_documents extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -325,7 +389,24 @@ class SupportgroupsModelHelp_documents extends JModelList
// From the supportgroups_help_document table
$query->from($db->quoteName('#__supportgroups_help_document', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -413,14 +494,15 @@ class SupportgroupsModelHelp_documents extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.title');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.location');
$id .= ':' . $this->getState('filter.admin_view');
- $id .= ':' . $this->getState('filter.site_view');
+ $id .= ':' . $this->getState('filter.site_view');
+ $id .= ':' . $this->getState('filter.title');
return parent::getStoreId($id);
}
diff --git a/admin/models/import.php b/admin/models/import.php
index c1ff5cb..e7f5500 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage import.php
@@ -440,7 +440,15 @@ class SupportgroupsModelImport extends JModelLegacy
$jinput = JFactory::getApplication()->input;
foreach($target_headers as $header)
{
- $data['target_headers'][$header] = $jinput->getString($header, null);
+ if (($column = $jinput->getString($header, false)) !== false ||
+ ($column = $jinput->getString(strtolower($header), false)) !== false)
+ {
+ $data['target_headers'][$header] = $column;
+ }
+ else
+ {
+ $data['target_headers'][$header] = null;
+ }
}
// set the data
if(isset($package['dir']))
diff --git a/admin/models/info_type.php b/admin/models/info_type.php
index e1457d1..88abd6d 100644
--- a/admin/models/info_type.php
+++ b/admin/models/info_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_type.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/info_types.php b/admin/models/info_types.php
index 13ef2ec..01e4154 100644
--- a/admin/models/info_types.php
+++ b/admin/models/info_types.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_types.php
@@ -40,6 +40,7 @@ class SupportgroupsModelInfo_types extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
@@ -49,11 +50,17 @@ class SupportgroupsModelInfo_types extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -63,27 +70,28 @@ class SupportgroupsModelInfo_types extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
$this->setState('filter.name', $name);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -161,9 +169,17 @@ class SupportgroupsModelInfo_types extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -189,7 +205,7 @@ class SupportgroupsModelInfo_types extends JModelList
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -209,7 +225,7 @@ class SupportgroupsModelInfo_types extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -227,7 +243,24 @@ class SupportgroupsModelInfo_types extends JModelList
// From the supportgroups_info_type table
$query->from($db->quoteName('#__supportgroups_info_type', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -315,6 +348,7 @@ class SupportgroupsModelInfo_types extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
diff --git a/admin/models/payment.php b/admin/models/payment.php
index c9c1685..fe72159 100644
--- a/admin/models/payment.php
+++ b/admin/models/payment.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payment.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/payments.php b/admin/models/payments.php
index c659cb0..fdbc2d9 100644
--- a/admin/models/payments.php
+++ b/admin/models/payments.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payments.php
@@ -40,10 +40,11 @@ class SupportgroupsModelPayments extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
- 'g.name',
+ 'g.name','support_group',
'a.year','year',
'a.amount','amount'
);
@@ -51,11 +52,17 @@ class SupportgroupsModelPayments extends JModelList
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -65,7 +72,26 @@ class SupportgroupsModelPayments extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
+
$support_group = $this->getUserStateFromRequest($this->context . '.filter.support_group', 'filter_support_group');
$this->setState('filter.support_group', $support_group);
@@ -74,24 +100,6 @@ class SupportgroupsModelPayments extends JModelList
$amount = $this->getUserStateFromRequest($this->context . '.filter.amount', 'filter_amount');
$this->setState('filter.amount', $amount);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -237,9 +245,17 @@ class SupportgroupsModelPayments extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -262,20 +278,44 @@ class SupportgroupsModelPayments extends JModelList
}
}
- // Filter by support_group.
- if ($support_group = $this->getState('filter.support_group'))
+ // Filter by Support_group.
+ $_support_group = $this->getState('filter.support_group');
+ if (is_numeric($_support_group))
{
- $query->where('a.support_group = ' . $db->quote($db->escape($support_group)));
+ if (is_float($_support_group))
+ {
+ $query->where('a.support_group = ' . (float) $_support_group);
+ }
+ else
+ {
+ $query->where('a.support_group = ' . (int) $_support_group);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_support_group))
+ {
+ $query->where('a.support_group = ' . $db->quote($db->escape($_support_group)));
}
// Filter by Year.
- if ($year = $this->getState('filter.year'))
+ $_year = $this->getState('filter.year');
+ if (is_numeric($_year))
{
- $query->where('a.year = ' . $db->quote($db->escape($year)));
+ if (is_float($_year))
+ {
+ $query->where('a.year = ' . (float) $_year);
+ }
+ else
+ {
+ $query->where('a.year = ' . (int) $_year);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_year))
+ {
+ $query->where('a.year = ' . $db->quote($db->escape($_year)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -295,7 +335,7 @@ class SupportgroupsModelPayments extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -313,7 +353,24 @@ class SupportgroupsModelPayments extends JModelList
// From the supportgroups_payment table
$query->from($db->quoteName('#__supportgroups_payment', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -411,6 +468,7 @@ class SupportgroupsModelPayments extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
diff --git a/admin/models/region.php b/admin/models/region.php
index 1c6789a..bf3061d 100644
--- a/admin/models/region.php
+++ b/admin/models/region.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage region.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
diff --git a/admin/models/regions.php b/admin/models/regions.php
index d3270a2..b08d9b5 100644
--- a/admin/models/regions.php
+++ b/admin/models/regions.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage regions.php
@@ -40,21 +40,28 @@ class SupportgroupsModelRegions extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
- 'a.name','name',
- 'g.name'
+ 'g.name','country',
+ 'a.name','name'
);
}
parent::__construct($config);
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -64,30 +71,31 @@ class SupportgroupsModelRegions extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
+
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$country = $this->getUserStateFromRequest($this->context . '.filter.country', 'filter_country');
- $this->setState('filter.country', $country);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
+ $this->setState('filter.country', $country);
+
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
// List state information.
parent::populateState($ordering, $direction);
@@ -169,9 +177,17 @@ class SupportgroupsModelRegions extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -194,15 +210,27 @@ class SupportgroupsModelRegions extends JModelList
}
}
- // Filter by country.
- if ($country = $this->getState('filter.country'))
+ // Filter by Country.
+ $_country = $this->getState('filter.country');
+ if (is_numeric($_country))
{
- $query->where('a.country = ' . $db->quote($db->escape($country)));
+ if (is_float($_country))
+ {
+ $query->where('a.country = ' . (float) $_country);
+ }
+ else
+ {
+ $query->where('a.country = ' . (int) $_country);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_country))
+ {
+ $query->where('a.country = ' . $db->quote($db->escape($_country)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -222,7 +250,7 @@ class SupportgroupsModelRegions extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -240,7 +268,24 @@ class SupportgroupsModelRegions extends JModelList
// From the supportgroups_region table
$query->from($db->quoteName('#__supportgroups_region', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -328,11 +373,12 @@ class SupportgroupsModelRegions extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
- $id .= ':' . $this->getState('filter.country');
+ $id .= ':' . $this->getState('filter.country');
+ $id .= ':' . $this->getState('filter.name');
return parent::getStoreId($id);
}
diff --git a/admin/models/support_group.php b/admin/models/support_group.php
index 2ff8879..31ef06b 100644
--- a/admin/models/support_group.php
+++ b/admin/models/support_group.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_group.php
@@ -26,8 +26,8 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper;
/**
@@ -197,9 +197,17 @@ class SupportgroupsModelSupport_group extends JModelAdmin
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
diff --git a/admin/models/support_groups.php b/admin/models/support_groups.php
index ceee435..eb9eefd 100644
--- a/admin/models/support_groups.php
+++ b/admin/models/support_groups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_groups.php
@@ -40,13 +40,14 @@ class SupportgroupsModelSupport_groups extends JModelList
$config['filter_fields'] = array(
'a.id','id',
'a.published','published',
+ 'a.access','access',
'a.ordering','ordering',
'a.created_by','created_by',
'a.modified_by','modified_by',
+ 'g.name','area',
+ 'h.name','facility',
'a.name','name',
'a.phone','phone',
- 'g.name',
- 'h.name',
'a.male','male',
'a.female','female'
);
@@ -220,11 +221,17 @@ class SupportgroupsModelSupport_groups extends JModelList
}
return false;
}
-
+
/**
* Method to auto-populate the model state.
*
+ * Note. Calling getState in this method will result in recursion.
+ *
+ * @param string $ordering An optional ordering field.
+ * @param string $direction An optional direction (asc|desc).
+ *
* @return void
+ *
*/
protected function populateState($ordering = null, $direction = null)
{
@@ -234,12 +241,25 @@ class SupportgroupsModelSupport_groups extends JModelList
if ($layout = $app->input->get('layout'))
{
$this->context .= '.' . $layout;
- }
- $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
- $this->setState('filter.name', $name);
+ }
- $phone = $this->getUserStateFromRequest($this->context . '.filter.phone', 'filter_phone');
- $this->setState('filter.phone', $phone);
+ $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
+ $this->setState('filter.access', $access);
+
+ $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+ $this->setState('filter.published', $published);
+
+ $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
+ $this->setState('filter.created_by', $created_by);
+
+ $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
+ $this->setState('filter.created', $created);
+
+ $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
+ $this->setState('filter.sorting', $sorting);
+
+ $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+ $this->setState('filter.search', $search);
$area = $this->getUserStateFromRequest($this->context . '.filter.area', 'filter_area');
$this->setState('filter.area', $area);
@@ -247,29 +267,17 @@ class SupportgroupsModelSupport_groups extends JModelList
$facility = $this->getUserStateFromRequest($this->context . '.filter.facility', 'filter_facility');
$this->setState('filter.facility', $facility);
+ $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
+ $this->setState('filter.name', $name);
+
+ $phone = $this->getUserStateFromRequest($this->context . '.filter.phone', 'filter_phone');
+ $this->setState('filter.phone', $phone);
+
$male = $this->getUserStateFromRequest($this->context . '.filter.male', 'filter_male');
$this->setState('filter.male', $male);
$female = $this->getUserStateFromRequest($this->context . '.filter.female', 'filter_female');
$this->setState('filter.female', $female);
-
- $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
- $this->setState('filter.sorting', $sorting);
-
- $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
- $this->setState('filter.access', $access);
-
- $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
- $this->setState('filter.search', $search);
-
- $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
- $this->setState('filter.published', $published);
-
- $created_by = $this->getUserStateFromRequest($this->context . '.filter.created_by', 'filter_created_by', '');
- $this->setState('filter.created_by', $created_by);
-
- $created = $this->getUserStateFromRequest($this->context . '.filter.created', 'filter_created');
- $this->setState('filter.created', $created);
// List state information.
parent::populateState($ordering, $direction);
@@ -355,9 +363,17 @@ class SupportgroupsModelSupport_groups extends JModelList
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
- if ($access = $this->getState('filter.access'))
+ $_access = $this->getState('filter.access');
+ if ($_access && is_numeric($_access))
{
- $query->where('a.access = ' . (int) $access);
+ $query->where('a.access = ' . (int) $_access);
+ }
+ elseif (SupportgroupsHelper::checkArray($_access))
+ {
+ // Secure the array for the query
+ $_access = ArrayHelper::toInteger($_access);
+ // Filter by the Access Array.
+ $query->where('a.access IN (' . implode(',', $_access) . ')');
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
@@ -380,20 +396,44 @@ class SupportgroupsModelSupport_groups extends JModelList
}
}
- // Filter by area.
- if ($area = $this->getState('filter.area'))
+ // Filter by Area.
+ $_area = $this->getState('filter.area');
+ if (is_numeric($_area))
{
- $query->where('a.area = ' . $db->quote($db->escape($area)));
+ if (is_float($_area))
+ {
+ $query->where('a.area = ' . (float) $_area);
+ }
+ else
+ {
+ $query->where('a.area = ' . (int) $_area);
+ }
}
- // Filter by facility.
- if ($facility = $this->getState('filter.facility'))
+ elseif (SupportgroupsHelper::checkString($_area))
{
- $query->where('a.facility = ' . $db->quote($db->escape($facility)));
+ $query->where('a.area = ' . $db->quote($db->escape($_area)));
+ }
+ // Filter by Facility.
+ $_facility = $this->getState('filter.facility');
+ if (is_numeric($_facility))
+ {
+ if (is_float($_facility))
+ {
+ $query->where('a.facility = ' . (float) $_facility);
+ }
+ else
+ {
+ $query->where('a.facility = ' . (int) $_facility);
+ }
+ }
+ elseif (SupportgroupsHelper::checkString($_facility))
+ {
+ $query->where('a.facility = ' . $db->quote($db->escape($_facility)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
- $orderDirn = $this->state->get('list.direction', 'asc');
+ $orderDirn = $this->state->get('list.direction', 'desc');
if ($orderCol != '')
{
$query->order($db->escape($orderCol . ' ' . $orderDirn));
@@ -413,7 +453,7 @@ class SupportgroupsModelSupport_groups extends JModelList
public function getExportData($pks, $user = null)
{
// setup the query
- if (SupportgroupsHelper::checkArray($pks))
+ if (($pks_size = SupportgroupsHelper::checkArray($pks)) !== false || 'bulk' === $pks)
{
// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
$_export = true;
@@ -431,7 +471,24 @@ class SupportgroupsModelSupport_groups extends JModelList
// From the supportgroups_support_group table
$query->from($db->quoteName('#__supportgroups_support_group', 'a'));
- $query->where('a.id IN (' . implode(',',$pks) . ')');
+ // The bulk export path
+ if ('bulk' === $pks)
+ {
+ $query->where('a.id > 0');
+ }
+ // A large array of ID's will not work out well
+ elseif ($pks_size > 500)
+ {
+ // Use lowest ID
+ $query->where('a.id >= ' . (int) min($pks));
+ // Use highest ID
+ $query->where('a.id <= ' . (int) max($pks));
+ }
+ // The normal default path
+ else
+ {
+ $query->where('a.id IN (' . implode(',',$pks) . ')');
+ }
// Implement View Level Access
if (!$user->authorise('core.options', 'com_supportgroups'))
{
@@ -519,13 +576,14 @@ class SupportgroupsModelSupport_groups extends JModelList
$id .= ':' . $this->getState('filter.id');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
+ $id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.ordering');
$id .= ':' . $this->getState('filter.created_by');
$id .= ':' . $this->getState('filter.modified_by');
- $id .= ':' . $this->getState('filter.name');
- $id .= ':' . $this->getState('filter.phone');
$id .= ':' . $this->getState('filter.area');
$id .= ':' . $this->getState('filter.facility');
+ $id .= ':' . $this->getState('filter.name');
+ $id .= ':' . $this->getState('filter.phone');
$id .= ':' . $this->getState('filter.male');
$id .= ':' . $this->getState('filter.female');
diff --git a/admin/models/supportgroups.php b/admin/models/supportgroups.php
index 1660283..86cbe90 100644
--- a/admin/models/supportgroups.php
+++ b/admin/models/supportgroups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage supportgroups.php
@@ -122,8 +122,8 @@ class SupportgroupsModelSupportgroups extends JModelList
$viewName = $name;
$alt = $name;
$url = $url;
- $image = $name.'.'.$type;
- $name = 'COM_SUPPORTGROUPS_DASHBOARD_'.SupportgroupsHelper::safeString($name,'U');
+ $image = $name . '.' . $type;
+ $name = 'COM_SUPPORTGROUPS_DASHBOARD_' . SupportgroupsHelper::safeString($name,'U');
}
}
// internal views
@@ -145,17 +145,27 @@ class SupportgroupsModelSupportgroups extends JModelList
switch($action)
{
case 'add':
- $url = 'index.php?option=com_supportgroups&view='.$name.'&layout=edit';
- $image = $name.'_'.$action.'.'.$type;
- $alt = $name.' '.$action;
+ $url = 'index.php?option=com_supportgroups&view=' . $name . '&layout=edit';
+ $image = $name . '_' . $action. '.' . $type;
+ $alt = $name . ' ' . $action;
$name = 'COM_SUPPORTGROUPS_DASHBOARD_'.SupportgroupsHelper::safeString($name,'U').'_ADD';
$add = true;
break;
default:
- $url = 'index.php?option=com_categories&view=categories&extension=com_supportgroups.'.$name;
- $image = $name.'_'.$action.'.'.$type;
- $alt = $name.' '.$action;
- $name = 'COM_SUPPORTGROUPS_DASHBOARD_'.SupportgroupsHelper::safeString($name,'U').'_'.SupportgroupsHelper::safeString($action,'U');
+ // check for new convention (more stable)
+ if (strpos($action, '_qpo0O0oqp_') !== false)
+ {
+ list($action, $extension) = (array) explode('_qpo0O0oqp_', $action);
+ $extension = str_replace('_po0O0oq_', '.', $extension);
+ }
+ else
+ {
+ $extension = 'com_supportgroups.' . $name;
+ }
+ $url = 'index.php?option=com_categories&view=categories&extension=' . $extension;
+ $image = $name . '_' . $action . '.' . $type;
+ $alt = $viewName . ' ' . $action;
+ $name = 'COM_SUPPORTGROUPS_DASHBOARD_' . SupportgroupsHelper::safeString($name,'U') . '_' . SupportgroupsHelper::safeString($action,'U');
break;
}
}
@@ -163,9 +173,9 @@ class SupportgroupsModelSupportgroups extends JModelList
{
$viewName = $name;
$alt = $name;
- $url = 'index.php?option=com_supportgroups&view='.$name;
- $image = $name.'.'.$type;
- $name = 'COM_SUPPORTGROUPS_DASHBOARD_'.SupportgroupsHelper::safeString($name,'U');
+ $url = 'index.php?option=com_supportgroups&view=' . $name;
+ $image = $name . '.' . $type;
+ $name = 'COM_SUPPORTGROUPS_DASHBOARD_' . SupportgroupsHelper::safeString($name,'U');
$hover = false;
}
}
@@ -173,8 +183,8 @@ class SupportgroupsModelSupportgroups extends JModelList
{
$viewName = $view;
$alt = $view;
- $url = 'index.php?option=com_supportgroups&view='.$view;
- $image = $view.'.png';
+ $url = 'index.php?option=com_supportgroups&view=' . $view;
+ $image = $view . '.png';
$name = ucwords($view).'
';
$hover = false;
}
@@ -186,7 +196,7 @@ class SupportgroupsModelSupportgroups extends JModelList
$dashboard_list = false;
$accessTo = '';
$accessAdd = '';
- // acces checking start
+ // access checking start
$accessCreate = (isset($viewAccess[$viewName.'.create'])) ? SupportgroupsHelper::checkString($viewAccess[$viewName.'.create']):false;
$accessAccess = (isset($viewAccess[$viewName.'.access'])) ? SupportgroupsHelper::checkString($viewAccess[$viewName.'.access']):false;
// set main controllers
@@ -201,7 +211,7 @@ class SupportgroupsModelSupportgroups extends JModelList
{
$accessAdd = 'core.create';
}
- // check if acces to view is set
+ // check if access to view is set
if ($accessAccess)
{
$accessTo = $viewAccess[$viewName.'.access'];
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 59e5bc2..7787542 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -487,9 +487,14 @@ INSERT INTO `#__supportgroups_area` (`id`, `alias`, `color`, `details`, `name`,
--
INSERT INTO `#__supportgroups_region` (`id`, `alias`, `country`, `name`, `published`, `created`) VALUES
-(1, 'khomas', 146, 'Khomas', 1, '2016-05-17 05:01:46'),
-(2, 'karas', 146, 'Karas', 1, '2016-05-17 05:01:57'),
-(3, 'region', 13, 'Region', 1, '2016-11-15 04:52:45');
+(1, 'act', 13, 'ACT', 1, '2016-05-17 05:01:46'),
+(2, 'nsw', 13, 'NSW', 1, '2016-05-17 05:01:57'),
+(3, 'nt', 13, 'NT', 1, '2016-11-15 04:52:45'),
+(4, 'qld', 13, 'QLD', 1, '2020-06-02 12:55:29'),
+(5, 'sa', 13, 'SA', 1, '2020-06-02 12:55:29'),
+(6, 'tas', 13, 'TAS', 1, '2020-06-02 12:55:29'),
+(7, 'vic', 13, 'VIC', 1, '2020-06-02 12:55:29'),
+(8, 'wa', 13, 'WA', 1, '2020-06-02 12:55:29');
--
-- Dumping data for table `#__supportgroups_country`
@@ -914,13 +919,3 @@ INSERT INTO `#__supportgroups_currency` (`id`, `asset_id`, `alias`, `codethree`,
(164, 0, '', 'ZZZ', 2, ',', 'Reserved', '', 0, '', 'O', '', '', 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '0000-00-00 00:00:00', 1, 0, 0, 164);
-
---
--- Always insure this column rules is large enough for all the access control values.
---
-ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';
-
---
--- Always insure this column name is large enough for long component and view names.
---
-ALTER TABLE `#__assets` CHANGE `name` `name` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The unique name for the asset.';
diff --git a/admin/sql/uninstall.mysql.utf8.sql b/admin/sql/uninstall.mysql.utf8.sql
index 6c5b6d3..414192e 100644
--- a/admin/sql/uninstall.mysql.utf8.sql
+++ b/admin/sql/uninstall.mysql.utf8.sql
@@ -10,3 +10,4 @@ DROP TABLE IF EXISTS `#__supportgroups_region`;
DROP TABLE IF EXISTS `#__supportgroups_country`;
DROP TABLE IF EXISTS `#__supportgroups_currency`;
DROP TABLE IF EXISTS `#__supportgroups_help_document`;
+
diff --git a/admin/supportgroups.php b/admin/supportgroups.php
index c9e59cf..5fd3f7d 100644
--- a/admin/supportgroups.php
+++ b/admin/supportgroups.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage supportgroups.php
@@ -25,6 +25,7 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
+
JHtml::_('behavior.tabstate');
// Access check.
diff --git a/admin/tables/additional_info.php b/admin/tables/additional_info.php
index 89c1bf7..244bef6 100644
--- a/admin/tables/additional_info.php
+++ b/admin/tables/additional_info.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage additional_info.php
diff --git a/admin/tables/area.php b/admin/tables/area.php
index 8c6a98f..86339ed 100644
--- a/admin/tables/area.php
+++ b/admin/tables/area.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area.php
diff --git a/admin/tables/area_type.php b/admin/tables/area_type.php
index 5921a57..1d7991e 100644
--- a/admin/tables/area_type.php
+++ b/admin/tables/area_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage area_type.php
diff --git a/admin/tables/country.php b/admin/tables/country.php
index a4f7242..c768928 100644
--- a/admin/tables/country.php
+++ b/admin/tables/country.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage country.php
diff --git a/admin/tables/currency.php b/admin/tables/currency.php
index f36b63d..503b2ee 100644
--- a/admin/tables/currency.php
+++ b/admin/tables/currency.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage currency.php
diff --git a/admin/tables/facility.php b/admin/tables/facility.php
index 01a577e..9266a38 100644
--- a/admin/tables/facility.php
+++ b/admin/tables/facility.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility.php
diff --git a/admin/tables/facility_type.php b/admin/tables/facility_type.php
index a817bcb..00cdb55 100644
--- a/admin/tables/facility_type.php
+++ b/admin/tables/facility_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage facility_type.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 323996e..9bb7d54 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage help_document.php
diff --git a/admin/tables/info_type.php b/admin/tables/info_type.php
index ccf109f..77b107f 100644
--- a/admin/tables/info_type.php
+++ b/admin/tables/info_type.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage info_type.php
diff --git a/admin/tables/payment.php b/admin/tables/payment.php
index c8fdac3..a278d5c 100644
--- a/admin/tables/payment.php
+++ b/admin/tables/payment.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage payment.php
diff --git a/admin/tables/region.php b/admin/tables/region.php
index 15178f4..009a003 100644
--- a/admin/tables/region.php
+++ b/admin/tables/region.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage region.php
diff --git a/admin/tables/support_group.php b/admin/tables/support_group.php
index f0ce4c1..5d8042d 100644
--- a/admin/tables/support_group.php
+++ b/admin/tables/support_group.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage support_group.php
diff --git a/admin/views/additional_info/submitbutton.js b/admin/views/additional_info/submitbutton.js
index e252e0e..a5dff0c 100644
--- a/admin/views/additional_info/submitbutton.js
+++ b/admin/views/additional_info/submitbutton.js
@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage submitbutton.js
diff --git a/admin/views/additional_info/tmpl/edit.php b/admin/views/additional_info/tmpl/edit.php
index 440d251..5aa7b5f 100644
--- a/admin/views/additional_info/tmpl/edit.php
+++ b/admin/views/additional_info/tmpl/edit.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.0.11
- @build 30th May, 2020
+ @build 6th January, 2021
@created 24th February, 2016
@package Support Groups
@subpackage edit.php
@@ -26,10 +26,10 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
-JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
-JHtml::_('formbehavior.chosen', 'select');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.keepalive');
$componentParams = $this->params; // will be removed just use $this->params instead
?>
@@ -70,7 +70,7 @@ $componentParams = $this->params; // will be removed just use $this->params inst
tab_name = 'additional_infoTab'; ?>
- canDo->get('additional_info.delete') || $this->canDo->get('additional_info.edit.created_by') || $this->canDo->get('additional_info.edit.state') || $this->canDo->get('additional_info.edit.created')) : ?>
+ canDo->get('additional_info.edit.created_by') || $this->canDo->get('additional_info.edit.created') || $this->canDo->get('additional_info.edit.state') || ($this->canDo->get('additional_info.delete') && $this->canDo->get('additional_info.edit.state'))) : ?>
|