diff --git a/README.md b/README.md index 04d67e0..f65eb31 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Support Groups (1.0.8) +# Support Groups (1.0.10) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Support Groups](http://www.vdm.io) + *First Build*: 24th February, 2016 -+ *Last Build*: 5th May, 2018 -+ *Version*: 1.0.8 ++ *Last Build*: 4th April, 2019 ++ *Version*: 1.0.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **66093** -+ *File count*: **492** ++ *Line count*: **66697** ++ *File count*: **494** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index 04d67e0..f65eb31 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Support Groups (1.0.8) +# Support Groups (1.0.10) This is a [Joomla 3.x](http://www.joomla.org/) component. @@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Support Groups](http://www.vdm.io) + *First Build*: 24th February, 2016 -+ *Last Build*: 5th May, 2018 -+ *Version*: 1.0.8 ++ *Last Build*: 4th April, 2019 ++ *Version*: 1.0.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **66093** -+ *File count*: **492** ++ *Line count*: **66697** ++ *File count*: **494** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/access.xml b/admin/access.xml index daeb22b..743f292 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -70,17 +70,35 @@ + + + + + + + + + + + + + + + + + + @@ -174,6 +192,9 @@ + + + @@ -191,6 +212,9 @@ + + + @@ -356,8 +380,14 @@ + + + + + +
@@ -367,6 +397,24 @@ + + + + + + + + + + + + + + + + + +
diff --git a/admin/assets/css/additional_info.css b/admin/assets/css/additional_info.css index ef1afd2..9366418 100644 --- a/admin/assets/css/additional_info.css +++ b/admin/assets/css/additional_info.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_info.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/additional_information.css b/admin/assets/css/additional_information.css index 7d44e05..5b3fab5 100644 --- a/admin/assets/css/additional_information.css +++ b/admin/assets/css/additional_information.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_information.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index e6ba80d..ed6646b 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage admin.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/area.css b/admin/assets/css/area.css index 8494575..6a19337 100644 --- a/admin/assets/css/area.css +++ b/admin/assets/css/area.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/area_type.css b/admin/assets/css/area_type.css index 137474e..c766d76 100644 --- a/admin/assets/css/area_type.css +++ b/admin/assets/css/area_type.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_type.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/area_types.css b/admin/assets/css/area_types.css index ac2e564..e136f98 100644 --- a/admin/assets/css/area_types.css +++ b/admin/assets/css/area_types.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_types.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/areas.css b/admin/assets/css/areas.css index 24c36ea..f5f7b98 100644 --- a/admin/assets/css/areas.css +++ b/admin/assets/css/areas.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage areas.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 12dd5e5..89d384c 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage countries.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 4aaed14..3f18bf2 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage country.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 6c4bfb6..c225826 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currencies.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 69d5d75..aae3690 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currency.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 1226869..3d124f6 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage dashboard.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/facilities.css b/admin/assets/css/facilities.css index 3f31a00..91d4d21 100644 --- a/admin/assets/css/facilities.css +++ b/admin/assets/css/facilities.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facilities.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/facility.css b/admin/assets/css/facility.css index 43434b7..234be09 100644 --- a/admin/assets/css/facility.css +++ b/admin/assets/css/facility.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/facility_type.css b/admin/assets/css/facility_type.css index 34e6e83..2d5d977 100644 --- a/admin/assets/css/facility_type.css +++ b/admin/assets/css/facility_type.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_type.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/facility_types.css b/admin/assets/css/facility_types.css index 046aee5..49a1b6a 100644 --- a/admin/assets/css/facility_types.css +++ b/admin/assets/css/facility_types.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_types.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index fa9669e..6bfec51 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage help_document.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index f8380cf..5e383e8 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage help_documents.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/info_type.css b/admin/assets/css/info_type.css index eb41c91..5e228cd 100644 --- a/admin/assets/css/info_type.css +++ b/admin/assets/css/info_type.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage info_type.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/info_types.css b/admin/assets/css/info_types.css index 0614673..837f29c 100644 --- a/admin/assets/css/info_types.css +++ b/admin/assets/css/info_types.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage info_types.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/payment.css b/admin/assets/css/payment.css index ecdc899..76e7966 100644 --- a/admin/assets/css/payment.css +++ b/admin/assets/css/payment.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage payment.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/payments.css b/admin/assets/css/payments.css index adc7db7..e7440fd 100644 --- a/admin/assets/css/payments.css +++ b/admin/assets/css/payments.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage payments.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/region.css b/admin/assets/css/region.css index 3f5ffb7..6b8311d 100644 --- a/admin/assets/css/region.css +++ b/admin/assets/css/region.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage region.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/regions.css b/admin/assets/css/regions.css index 122d343..944e09a 100644 --- a/admin/assets/css/regions.css +++ b/admin/assets/css/regions.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage regions.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/support_group.css b/admin/assets/css/support_group.css index eb846cc..ebf9069 100644 --- a/admin/assets/css/support_group.css +++ b/admin/assets/css/support_group.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage support_group.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/css/support_groups.css b/admin/assets/css/support_groups.css index f440c71..c7e36ee 100644 --- a/admin/assets/css/support_groups.css +++ b/admin/assets/css/support_groups.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage support_groups.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 6842788..b8e245e 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage admin.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* JS Document */ diff --git a/admin/config.xml b/admin/config.xml index aa4e04c..5230bf0 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -183,6 +183,7 @@ label="COM_SUPPORTGROUPS_CONFIG_API_KEY_LABEL" size="60" maxlength="150" + default="" description="COM_SUPPORTGROUPS_CONFIG_API_KEY_DESCRIPTION" class="text_area" filter="STRING" diff --git a/admin/controller.php b/admin/controller.php index def7be8..9595bf9 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage controller.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controller library -jimport('joomla.application.component.controller'); - /** * General Controller of Supportgroups component */ diff --git a/admin/controllers/additional_info.php b/admin/controllers/additional_info.php index c617714..7327c02 100644 --- a/admin/controllers/additional_info.php +++ b/admin/controllers/additional_info.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_info.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Additional_info Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerAdditional_info extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Additional_information'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerAdditional_info extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups'); + $access = $user->authorise('additional_info.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('additional_info.create', $this->option); + return $user->authorise('additional_info.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerAdditional_info extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerAdditional_info extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerAdditional_info extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerAdditional_info extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerAdditional_info extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerAdditional_info extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/additional_information.php b/admin/controllers/additional_information.php index fe6289c..b2c2725 100644 --- a/admin/controllers/additional_information.php +++ b/admin/controllers/additional_information.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_information.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Additional_information Controller */ class SupportgroupsControllerAdditional_information extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Additional_info', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Additional_info', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerAdditional_information extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=additional_information', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 07b602a..334f999 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage ajax.json.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controller'); - /** * Supportgroups Ajax Controller */ diff --git a/admin/controllers/area.php b/admin/controllers/area.php index 532f6cb..7da0d94 100644 --- a/admin/controllers/area.php +++ b/admin/controllers/area.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Area Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerArea extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Areas'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerArea extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('area.access', 'com_supportgroups'); + $access = $user->authorise('area.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('area.create', $this->option); + return $user->authorise('area.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerArea extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerArea extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerArea extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerArea extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerArea extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerArea extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/area_type.php b/admin/controllers/area_type.php index a43ef5a..65f03bc 100644 --- a/admin/controllers/area_type.php +++ b/admin/controllers/area_type.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_type.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Area_type Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerArea_type extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Area_types'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerArea_type extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('area_type.access', 'com_supportgroups'); + $access = $user->authorise('area_type.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('area_type.create', $this->option); + return $user->authorise('area_type.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerArea_type extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerArea_type extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerArea_type extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerArea_type extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerArea_type extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerArea_type extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/area_types.php b/admin/controllers/area_types.php index 4726fce..60431a1 100644 --- a/admin/controllers/area_types.php +++ b/admin/controllers/area_types.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_types.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Area_types Controller */ class SupportgroupsControllerArea_types extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_AREA_TYPES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Area_type', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_AREA_TYPES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Area_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerArea_types extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=area_types', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/areas.php b/admin/controllers/areas.php index 6966040..f5729e8 100644 --- a/admin/controllers/areas.php +++ b/admin/controllers/areas.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage areas.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Areas Controller */ class SupportgroupsControllerAreas extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_AREAS'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Area', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_AREAS'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Area', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerAreas extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=areas', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 7f9fc01..2fa4235 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage countries.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Countries Controller */ class SupportgroupsControllerCountries extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_COUNTRIES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Country', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_COUNTRIES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Country', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerCountries extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=countries', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/country.php b/admin/controllers/country.php index e8559ed..47eab02 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage country.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Country Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerCountry extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Countries'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerCountry extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('country.access', 'com_supportgroups'); + $access = $user->authorise('country.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('country.create', $this->option); + return $user->authorise('country.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerCountry extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerCountry extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerCountry extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerCountry extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerCountry extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerCountry extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 48916a1..03a408d 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currencies.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Currencies Controller */ class SupportgroupsControllerCurrencies extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_CURRENCIES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Currency', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_CURRENCIES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Currency', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerCurrencies extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=currencies', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 8386eb0..97f9339 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currency.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Currency Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerCurrency extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Currencies'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerCurrency extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('currency.access', 'com_supportgroups'); + $access = $user->authorise('currency.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('currency.create', $this->option); + return $user->authorise('currency.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerCurrency extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerCurrency extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerCurrency extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerCurrency extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerCurrency extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerCurrency extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/facilities.php b/admin/controllers/facilities.php index 277af31..0ec80a3 100644 --- a/admin/controllers/facilities.php +++ b/admin/controllers/facilities.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facilities.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Facilities Controller */ class SupportgroupsControllerFacilities extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITIES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Facility', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITIES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Facility', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerFacilities extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=facilities', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/facility.php b/admin/controllers/facility.php index 77151fb..eb4df05 100644 --- a/admin/controllers/facility.php +++ b/admin/controllers/facility.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Facility Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerFacility extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Facilities'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerFacility extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('facility.access', 'com_supportgroups'); + $access = $user->authorise('facility.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('facility.create', $this->option); + return $user->authorise('facility.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerFacility extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerFacility extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerFacility extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerFacility extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerFacility extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerFacility extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/facility_type.php b/admin/controllers/facility_type.php index 7854d20..bd64935 100644 --- a/admin/controllers/facility_type.php +++ b/admin/controllers/facility_type.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_type.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Facility_type Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerFacility_type extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Facility_types'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerFacility_type extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups'); + $access = $user->authorise('facility_type.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('facility_type.create', $this->option); + return $user->authorise('facility_type.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerFacility_type extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerFacility_type extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerFacility_type extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerFacility_type extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerFacility_type extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerFacility_type extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/facility_types.php b/admin/controllers/facility_types.php index 459a4e5..c43a400 100644 --- a/admin/controllers/facility_types.php +++ b/admin/controllers/facility_types.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_types.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Facility_types Controller */ class SupportgroupsControllerFacility_types extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITY_TYPES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Facility_type', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_FACILITY_TYPES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Facility_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerFacility_types extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=facility_types', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 997a31a..8ac6ce4 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage help.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controller'); - /** * Supportgroups Help Controller */ diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index b5a4fdc..432432c 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage help_document.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Help_document Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerHelp_document extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerHelp_document extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('help_document.access', 'com_supportgroups'); + $access = $user->authorise('help_document.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('help_document.create', $this->option); + return $user->authorise('help_document.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerHelp_document extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerHelp_document extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerHelp_document extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerHelp_document extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerHelp_document extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerHelp_document extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 33b5e8a..d71d2b3 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage help_documents.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Help_documents Controller */ class SupportgroupsControllerHelp_documents extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_HELP_DOCUMENTS'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Help_document', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_HELP_DOCUMENTS'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Help_document', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerHelp_documents extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=help_documents', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 1997c40..16abe8c 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage import.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/controllers/info_type.php b/admin/controllers/info_type.php index 00e2405..67d7314 100644 --- a/admin/controllers/info_type.php +++ b/admin/controllers/info_type.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage info_type.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Info_type Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerInfo_type extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Info_types'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerInfo_type extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('info_type.access', 'com_supportgroups'); + $access = $user->authorise('info_type.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('info_type.create', $this->option); + return $user->authorise('info_type.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerInfo_type extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerInfo_type extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerInfo_type extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerInfo_type extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerInfo_type extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerInfo_type extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/info_types.php b/admin/controllers/info_types.php index a4fccdb..425e103 100644 --- a/admin/controllers/info_types.php +++ b/admin/controllers/info_types.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage info_types.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Info_types Controller */ class SupportgroupsControllerInfo_types extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_INFO_TYPES'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Info_type', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_INFO_TYPES'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Info_type', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerInfo_types extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=info_types', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/payment.php b/admin/controllers/payment.php index ec86e15..6c1368d 100644 --- a/admin/controllers/payment.php +++ b/admin/controllers/payment.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage payment.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Payment Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerPayment extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Payments'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerPayment extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('payment.access', 'com_supportgroups'); + $access = $user->authorise('payment.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('payment.create', $this->option); + return $user->authorise('payment.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerPayment extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerPayment extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerPayment extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerPayment extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerPayment extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerPayment extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/payments.php b/admin/controllers/payments.php index 2c26219..65554fa 100644 --- a/admin/controllers/payments.php +++ b/admin/controllers/payments.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage payments.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Payments Controller */ class SupportgroupsControllerPayments extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_PAYMENTS'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Payment', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_PAYMENTS'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Payment', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerPayments extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=payments', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/region.php b/admin/controllers/region.php index a690633..3efc841 100644 --- a/admin/controllers/region.php +++ b/admin/controllers/region.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage region.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Region Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerRegion extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Regions'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerRegion extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('region.access', 'com_supportgroups'); + $access = $user->authorise('region.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('region.create', $this->option); + return $user->authorise('region.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerRegion extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerRegion extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerRegion extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerRegion extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerRegion extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerRegion extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/regions.php b/admin/controllers/regions.php index 6db5a9c..0fe3b84 100644 --- a/admin/controllers/regions.php +++ b/admin/controllers/regions.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage regions.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Regions Controller */ class SupportgroupsControllerRegions extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_REGIONS'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Region', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_REGIONS'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Region', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,5 +116,5 @@ class SupportgroupsControllerRegions extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=regions', false), $message, 'error'); return; - } + } } diff --git a/admin/controllers/support_group.php b/admin/controllers/support_group.php index c9c8678..b84bcdf 100644 --- a/admin/controllers/support_group.php +++ b/admin/controllers/support_group.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage support_group.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controllerform'); - /** * Support_group Controller */ @@ -43,6 +40,13 @@ class SupportgroupsControllerSupport_group extends JControllerForm */ protected $task; + /** + * Class constructor. + * + * @param array $config A named array of configuration variables. + * + * @since 1.6 + */ public function __construct($config = array()) { $this->view_list = 'Support_groups'; // safeguard for setting the return view listing to the main view. @@ -60,14 +64,17 @@ class SupportgroupsControllerSupport_group extends JControllerForm */ protected function allowAdd($data = array()) { + // Get user object. + $user = JFactory::getUser(); // Access check. - $access = JFactory::getUser()->authorise('support_group.access', 'com_supportgroups'); + $access = $user->authorise('support_group.access', 'com_supportgroups'); if (!$access) { return false; } + // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('support_group.create', $this->option); + return $user->authorise('support_group.create', $this->option); } /** @@ -83,9 +90,9 @@ class SupportgroupsControllerSupport_group extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { // get user object. - $user = JFactory::getUser(); + $user = JFactory::getUser(); // get record id. - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; // Access check. @@ -141,42 +148,25 @@ class SupportgroupsControllerSupport_group extends JControllerForm * * @return string The arguments to append to the redirect URL. * - * @since 12.2 + * @since 1.6 */ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') { - $tmpl = $this->input->get('tmpl'); - $layout = $this->input->get('layout', 'edit', 'string'); + // get the referral options (old method use return instead see parent) + $ref = $this->input->get('ref', 0, 'string'); + $refid = $this->input->get('refid', 0, 'int'); - $ref = $this->input->get('ref', 0, 'string'); - $refid = $this->input->get('refid', 0, 'int'); + // get redirect info. + $append = parent::getRedirectToItemAppend($recordId, $urlVar); - // Setup redirect info. - - $append = ''; - - if ($refid) + // set the referral options + if ($refid && $ref) { - $append .= '&ref='.(string)$ref.'&refid='.(int)$refid; + $append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append; } elseif ($ref) { - $append .= '&ref='.(string)$ref; - } - - if ($tmpl) - { - $append .= '&tmpl=' . $tmpl; - } - - if ($layout) - { - $append .= '&layout=' . $layout; - } - - if ($recordId) - { - $append .= '&' . $urlVar . '=' . $recordId; + $append = '&ref='. (string)$ref . $append; } return $append; @@ -215,43 +205,45 @@ class SupportgroupsControllerSupport_group extends JControllerForm */ public function cancel($key = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); + + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); $cancel = parent::cancel($key); - if ($cancel) + if (!is_null($return) && JUri::isInternal(base64_decode($return))) { - if ($this->refid) - { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); - // Redirect to the item screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - elseif ($this->ref) - { - $redirect = '&view='.(string)$this->ref; - - // Redirect to the list screen. - $this->setRedirect( - JRoute::_( - 'index.php?option=' . $this->option . $redirect, false - ) - ); - } - } - else - { - // Redirect to the items screen. + // Redirect to the return value. $this->setRedirect( JRoute::_( - 'index.php?option=' . $this->option . '&view=' . $this->view_list, false + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; + + // Redirect to the item screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false + ) + ); + } + elseif ($this->ref) + { + $redirect = '&view='.(string)$this->ref; + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . $redirect, false ) ); } @@ -270,11 +262,15 @@ class SupportgroupsControllerSupport_group extends JControllerForm */ public function save($key = null, $urlVar = null) { - // get the referal details - $this->ref = $this->input->get('ref', 0, 'word'); - $this->refid = $this->input->get('refid', 0, 'int'); + // get the referral options + $this->ref = $this->input->get('ref', 0, 'word'); + $this->refid = $this->input->get('refid', 0, 'int'); - if ($this->ref || $this->refid) + // Check if there is a return value + $return = $this->input->get('return', null, 'base64'); + $canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return))); + + if ($this->ref || $this->refid || $canReturn) { // to make sure the item is checkedin on redirect $this->task = 'save'; @@ -282,9 +278,22 @@ class SupportgroupsControllerSupport_group extends JControllerForm $saved = parent::save($key, $urlVar); - if ($this->refid && $saved) + // This is not needed since parent save already does this + // Due to the ref and refid implementation we need to add this + if ($canReturn) { - $redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid; + $redirect = base64_decode($return); + + // Redirect to the return value. + $this->setRedirect( + JRoute::_( + $redirect, false + ) + ); + } + elseif ($this->refid && $this->ref) + { + $redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid; // Redirect to the item screen. $this->setRedirect( @@ -293,9 +302,9 @@ class SupportgroupsControllerSupport_group extends JControllerForm ) ); } - elseif ($this->ref && $saved) + elseif ($this->ref) { - $redirect = '&view='.(string)$this->ref; + $redirect = '&view=' . (string)$this->ref; // Redirect to the list screen. $this->setRedirect( diff --git a/admin/controllers/support_groups.php b/admin/controllers/support_groups.php index 3d57ed7..c99f102 100644 --- a/admin/controllers/support_groups.php +++ b/admin/controllers/support_groups.php @@ -6,44 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage support_groups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Support_groups Controller */ class SupportgroupsControllerSupport_groups extends JControllerAdmin { - protected $text_prefix = 'COM_SUPPORTGROUPS_SUPPORT_GROUPS'; /** - * Proxy for getModel. - * @since 2.5 + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 */ - public function getModel($name = 'Support_group', $prefix = 'SupportgroupsModel', $config = array()) + protected $text_prefix = 'COM_SUPPORTGROUPS_SUPPORT_GROUPS'; + + /** + * Method to get a model object, loading it if required. + * + * @param string $name The model name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return JModelLegacy The model. + * + * @since 1.6 + */ + public function getModel($name = 'Support_group', $prefix = 'SupportgroupsModel', $config = array('ignore_request' => true)) { - $model = parent::getModel($name, $prefix, array('ignore_request' => true)); - - return $model; + return parent::getModel($name, $prefix, $config); } public function exportData() @@ -107,7 +116,7 @@ class SupportgroupsControllerSupport_groups extends JControllerAdmin $message = JText::_('COM_SUPPORTGROUPS_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_supportgroups&view=support_groups', false), $message, 'error'); return; - } + } public function smartExport() { diff --git a/admin/controllers/supportgroups.php b/admin/controllers/supportgroups.php index 6793629..38d474b 100644 --- a/admin/controllers/supportgroups.php +++ b/admin/controllers/supportgroups.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controlleradmin library -jimport('joomla.application.component.controlleradmin'); - /** * Supportgroups Controller */ diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 10d23dd..5e4b079 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage headercheck.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index e688ee1..fd3aa77 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage batch_.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/helpers/negativefinder.php b/admin/helpers/negativefinder.php index 77c7b04..3369313 100644 --- a/admin/helpers/negativefinder.php +++ b/admin/helpers/negativefinder.php @@ -14,54 +14,54 @@ defined('_JEXEC') or die; * Detecting negative numbers **/ -class Expression +class SupportgroupsExpression { - protected $expression; - protected $result; + protected $expression; + protected $result; - public function __construct($expression) + public function __construct($expression) { - $this->expression = $expression; - } + $this->expression = $expression; + } - public function evaluate() + public function evaluate() { - $this->result = eval("return ".$this->expression.";"); - return $this; - } + $this->result = eval("return ".$this->expression.";"); + return $this; + } - public function getResult() + public function getResult() { - return $this->result; - } + return $this->result; + } } -class NegativeFinder +class SupportgroupsNegativeFinder { - protected $expressionObj; + protected $expressionObj; - public function __construct(Expression $expressionObj) + public function __construct(SupportgroupsExpression $expressionObj) { - $this->expressionObj = $expressionObj; - } + $this->expressionObj = $expressionObj; + } - public function isItNegative() + public function isItNegative() { - $result = $this->expressionObj->evaluate()->getResult(); - - if($this->hasMinusSign($result)) + $result = $this->expressionObj->evaluate()->getResult(); + + if($this->hasMinusSign($result)) { - return true; - } + return true; + } else { - return false; - } - } + return false; + } + } - protected function hasMinusSign($value) + protected function hasMinusSign($value) { - return (substr(strval($value), 0, 1) == "-"); - } + return (substr(strval($value), 0, 1) == "-"); + } } diff --git a/admin/helpers/supportgroups.php b/admin/helpers/supportgroups.php index a019439..0bc3627 100644 --- a/admin/helpers/supportgroups.php +++ b/admin/helpers/supportgroups.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); * Supportgroups component helper. */ abstract class SupportgroupsHelper -{ +{ /** * The global params @@ -194,8 +194,13 @@ abstract class SupportgroupsHelper * @return string On success the path or url is returned based on the type requested * */ - public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true) + public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = '', $createIfNotSet = true) { + // make sure to always have a string/path + if(!self::checkString($default)) + { + $default = JPATH_SITE . '/images/'; + } // get the global settings if (!self::checkObject(self::$params)) { @@ -250,9 +255,9 @@ abstract class SupportgroupsHelper // sanitize the path return '/' . trim( $filePath, '/' ) . '/' . $fileName; } - + /** - * Load the Component xml manifest. + * Load the Component xml manifest. **/ public static function manifest() { @@ -261,12 +266,12 @@ abstract class SupportgroupsHelper } /** - * Joomla version object + * Joomla version object **/ protected static $JVersion; /** - * set/get Joomla version + * set/get Joomla version **/ public static function jVersion() { @@ -279,7 +284,7 @@ abstract class SupportgroupsHelper } /** - * Load the Contributors details. + * Load the Contributors details. **/ public static function getContributors() { @@ -317,8 +322,8 @@ abstract class SupportgroupsHelper } /** - * Load the Component Help URLs. - **/ + * Load the Component Help URLs. + **/ public static function getHelpUrl($view) { $user = JFactory::getUser(); @@ -355,15 +360,15 @@ abstract class SupportgroupsHelper // set joomla article case 1: return self::loadArticleLink($help->article); - break; + break; // set help text case 2: return self::loadHelpTextLink($help->id); - break; + break; // set Link case 3: return $help->url; - break; + break; } } } @@ -372,16 +377,16 @@ abstract class SupportgroupsHelper } /** - * Get the Article Link. - **/ + * Get the Article Link. + **/ protected static function loadArticleLink($id) { return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal'; } /** - * Get the Help Text Link. - **/ + * Get the Help Text Link. + **/ protected static function loadHelpTextLink($id) { $token = JSession::getFormToken(); @@ -389,7 +394,7 @@ abstract class SupportgroupsHelper } /** - * Configure the Linkbar. + * Configure the Linkbar. **/ public static function addSubmenu($submenu) { @@ -433,11 +438,11 @@ abstract class SupportgroupsHelper { JHtmlSidebar::addEntry(JText::_('COM_SUPPORTGROUPS_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_supportgroups&view=help_documents', $submenu === 'help_documents'); } - } + } /** - * UIKIT Component Classes - **/ + * UIKIT Component Classes + **/ public static $uk_components = array( 'data-uk-grid' => array( 'grid' ), @@ -491,15 +496,15 @@ abstract class SupportgroupsHelper 'upload-drop' => array( 'upload', 'form-file' ) ); - + /** - * Add UIKIT Components - **/ + * Add UIKIT Components + **/ public static $uikit = false; /** - * Get UIKIT Components - **/ + * Get UIKIT Components + **/ public static function getUikitComp($content,$classes = array()) { if (strpos($content,'class="uk-') !== false) @@ -529,13 +534,13 @@ abstract class SupportgroupsHelper } return $temp; } - } + } if (self::checkArray($classes)) { return $classes; } return false; - } + } /** * Prepares the xml document @@ -565,19 +570,19 @@ abstract class SupportgroupsHelper { $subjectTab = 'Sheet1'; } - - // make sure the file is loaded + + // make sure the file is loaded JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers'); - + // Create new PHPExcel object $objPHPExcel = new PHPExcel(); - + // Set document properties $objPHPExcel->getProperties()->setCreator($creator) - ->setCompany('Vast Development Method') - ->setLastModifiedBy($modified) - ->setTitle($title) - ->setSubject($subjectTab); + ->setCompany('Vast Development Method') + ->setLastModifiedBy($modified) + ->setTitle($title) + ->setSubject($subjectTab); if (!$description) { $objPHPExcel->getProperties()->setDescription($description); @@ -590,7 +595,7 @@ abstract class SupportgroupsHelper { $objPHPExcel->getProperties()->setCategory($category); } - + // Some styles $headerStyles = array( 'font' => array( @@ -612,7 +617,7 @@ abstract class SupportgroupsHelper 'size' => 11, 'name' => 'Verdana' )); - + // Add some data if (self::checkArray($rows)) { @@ -639,43 +644,43 @@ abstract class SupportgroupsHelper { return false; } - + // Rename worksheet $objPHPExcel->getActiveSheet()->setTitle($subjectTab); - + // Set active sheet index to the first sheet, so Excel opens this as the first sheet $objPHPExcel->setActiveSheetIndex(0); - + // Redirect output to a client's web browser (Excel5) header('Content-Type: application/vnd.ms-excel'); header('Content-Disposition: attachment;filename="'.$fileName.'.xls"'); 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'); - + // If you're serving to IE over SSL, then the following may be needed header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1 header ('Pragma: public'); // HTTP/1.0 - + $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); $objWriter->save('php://output'); jexit(); } - + /** - * Get CSV Headers - */ + * Get CSV Headers + */ public static function getFileHeaders($dataType) - { - // make sure these files are loaded + { + // make sure these files are loaded JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers'); JLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader'); // get session object - $session = JFactory::getSession(); - $package = $session->get('package', null); - $package = json_decode($package, true); + $session = JFactory::getSession(); + $package = $session->get('package', null); + $package = json_decode($package, true); // set the headers if(isset($package['dir'])) { @@ -853,16 +858,16 @@ abstract class SupportgroupsHelper { if ($external) { - if ($name = self::getVar(null, $val, $id, $name, '=', $table)) + if ($_name = self::getVar(null, $val, $id, $name, '=', $table)) { - $names[] = $name; + $names[] = $_name; } } else { - if ($name = self::getVar($table, $val, $id, $name)) + if ($_name = self::getVar($table, $val, $id, $name)) { - $names[] = $name; + $names[] = $_name; } } } @@ -918,183 +923,149 @@ abstract class SupportgroupsHelper } /** - * Get the actions permissions + * Get the action permissions + * + * @param string $view The related view name + * @param int $record The item to act upon + * @param string $views The related list view name + * @param mixed $target Only get this permission (like edit, create, delete) + * @param string $component The target component + * + * @return object The JObject of permission/authorised actions + * **/ - public static function getActions($view,&$record = null,$views = null) + public static function getActions($view, &$record = null, $views = null, $target = null, $component = 'supportgroups') { - jimport('joomla.access.access'); - - $user = JFactory::getUser(); - $result = new JObject; - $view = self::safeString($view); + // get the user object + $user = JFactory::getUser(); + // load the JObject + $result = new JObject; + // make view name safe (just incase) + $view = self::safeString($view); if (self::checkString($views)) { $views = self::safeString($views); } // get all actions from component - $actions = JAccess::getActions('com_supportgroups', 'component'); - // set acctions only set in component settiongs - $componentActions = array('core.admin','core.manage','core.options','core.export'); + $actions = JAccess::getActionsFromFile( + JPATH_ADMINISTRATOR . '/components/com_' . $component . '/access.xml', + "/access/section[@name='component']/" + ); + // if non found then return empty JObject + if (empty($actions)) + { + return $result; + } + // get created by if not found + if (self::checkObject($record) && !isset($record->created_by) && isset($record->id)) + { + $record->created_by = self::getVar($view, $record->id, 'id', 'created_by', '=', $component); + } + // set actions only set in component settings + $componentActions = array('core.admin', 'core.manage', 'core.options', 'core.export'); + // check if we have a target + $checkTarget = false; + if ($target) + { + // convert to an array + if (self::checkString($target)) + { + $target = array($target); + } + // check if we are good to go + if (self::checkArray($target)) + { + $checkTarget = true; + } + } // loop the actions and set the permissions foreach ($actions as $action) { - // set to use component default - $fallback= true; - if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) + // check target action filter + if ($checkTarget && self::filterActions($view, $action->name, $target)) { + continue; + } + // set to use component default + $fallback = true; + // reset permission per/action + $permission = false; + $catpermission = false; + // set area + $area = 'comp'; + // check if the record has an ID and the action is item related (not a component action) + if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name, $componentActions) && + (strpos($action->name, 'core.') !== false || strpos($action->name, $view . '.') !== false)) + { + // we are in item + $area = 'item'; // The record has been set. Check the record permissions. - $permission = $user->authorise($action->name, 'com_supportgroups.'.$view.'.' . (int) $record->id); - if (!$permission) // TODO removed && !is_null($permission) + $permission = $user->authorise($action->name, 'com_' . $component . '.' . $view . '.' . (int) $record->id); + // if no permission found, check edit own + if (!$permission) { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') + // With edit, if the created_by matches current user then dig deeper. + if (($action->name === 'core.edit' || $action->name === $view . '.edit') && $record->created_by > 0 && ($record->created_by == $user->id)) { - if ($user->authorise('core.edit.own', 'com_supportgroups.'.$view.'.' . (int) $record->id)) + // the correct target + $coreCheck = (array) explode('.', $action->name); + // check that we have both local and global access + if ($user->authorise($coreCheck[0] . '.edit.own', 'com_' . $component . '.' . $view . '.' . (int) $record->id) && + $user->authorise($coreCheck[0] . '.edit.own', 'com_' . $component)) { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } + // allow edit + $result->set($action->name, true); + // set not to use global default + // because we already validated it + $fallback = false; } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups.'.$view.'.' . (int) $record->id)) + else { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } - } - elseif ($user->authorise('core.edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } + // do not allow edit + $result->set($action->name, false); + $fallback = false; } } } elseif (self::checkString($views) && isset($record->catid) && $record->catid > 0) { + // we are in item + $area = 'category'; + // set the core check + $coreCheck = explode('.', $action->name); + $core = $coreCheck[0]; // make sure we use the core. action check for the categories - if (strpos($action->name,$view) !== false && strpos($action->name,'core.') === false ) { - $coreCheck = explode('.',$action->name); - $coreCheck[0] = 'core'; - $categoryCheck = implode('.',$coreCheck); + if (strpos($action->name, $view) !== false && strpos($action->name, 'core.') === false ) + { + $coreCheck[0] = 'core'; + $categoryCheck = implode('.', $coreCheck); } else { $categoryCheck = $action->name; } // The record has a category. Check the category permissions. - $catpermission = $user->authorise($categoryCheck, 'com_supportgroups.'.$views.'.category.' . (int) $record->catid); + $catpermission = $user->authorise($categoryCheck, 'com_' . $component . '.' . $views . '.category.' . (int) $record->catid); if (!$catpermission && !is_null($catpermission)) { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') + // With edit, if the created_by matches current user then dig deeper. + if (($action->name === 'core.edit' || $action->name === $view . '.edit') && $record->created_by > 0 && ($record->created_by == $user->id)) { - if ($user->authorise('core.edit.own', 'com_supportgroups.'.$views.'.category.' . (int) $record->catid)) + // check that we have both local and global access + if ($user->authorise('core.edit.own', 'com_' . $component . '.' . $views . '.category.' . (int) $record->catid) && + $user->authorise($core . '.edit.own', 'com_' . $component)) { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } + // allow edit + $result->set($action->name, true); + // set not to use global default + // because we already validated it + $fallback = false; } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups.'.$views.'.category.' . (int) $record->catid)) + else { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } - } - elseif ($user->authorise('core.edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback= false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback= false; - } + // do not allow edit + $result->set($action->name, false); + $fallback = false; } } } @@ -1103,14 +1074,49 @@ abstract class SupportgroupsHelper // if allowed then fallback on component global settings if ($fallback) { - $result->set($action->name, $user->authorise($action->name, 'com_supportgroups')); + // if item/category blocks access then don't fall back on global + if ((($area === 'item') && !$permission) || (($area === 'category') && !$catpermission)) + { + // do not allow + $result->set($action->name, false); + } + // Finally remember the global settings have the final say. (even if item allow) + // The local item permissions can block, but it can't open and override of global permissions. + // Since items are created by users and global permissions is set by system admin. + else + { + $result->set($action->name, $user->authorise($action->name, 'com_' . $component)); + } } } return $result; } /** - * Get any component's model + * Filter the action permissions + * + * @param string $action The action to check + * @param array $targets The array of target actions + * + * @return boolean true if action should be filtered out + * + **/ + protected static function filterActions(&$view, &$action, &$targets) + { + foreach ($targets as $target) + { + if (strpos($action, $view . '.' . $target) !== false || + strpos($action, 'core.' . $target) !== false) + { + return false; + break; + } + } + return true; + } + + /** + * Get any component's model **/ public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = 'Supportgroups', $config = array()) { @@ -1154,9 +1160,9 @@ abstract class SupportgroupsHelper } /** - * Add to asset Table + * Add to asset Table */ - public static function setAsset($id,$table) + public static function setAsset($id, $table, $inherit = true) { $parent = JTable::getInstance('Asset'); $parent->loadByName('com_supportgroups'); @@ -1188,7 +1194,7 @@ abstract class SupportgroupsHelper $asset->name = $name; $asset->title = $title; // get the default asset rules - $rules = self::getDefaultAssetRules('com_supportgroups',$table); + $rules = self::getDefaultAssetRules('com_supportgroups', $table, $inherit); if ($rules instanceof JAccessRules) { $asset->rules = (string) $rules; @@ -1216,55 +1222,62 @@ abstract class SupportgroupsHelper } /** - * Gets the default asset Rules for a component/view. + * Gets the default asset Rules for a component/view. */ - protected static function getDefaultAssetRules($component,$view) + protected static function getDefaultAssetRules($component, $view, $inherit = true) { - // Need to find the asset id by the name of the component. - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__assets')) - ->where($db->quoteName('name') . ' = ' . $db->quote($component)); - $db->setQuery($query); - $db->execute(); - if ($db->loadRowList()) + // if new or inherited + $assetId = 0; + // Only get the actual item rules if not inheriting + if (!$inherit) { - // asset alread set so use saved rules - $assetId = (int) $db->loadResult(); - $result = JAccess::getAssetRules($assetId); - if ($result instanceof JAccessRules) + // Need to find the asset id by the name of the component. + $db = JFactory::getDbo(); + $query = $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__assets')) + ->where($db->quoteName('name') . ' = ' . $db->quote($component)); + $db->setQuery($query); + $db->execute(); + // check that there is a value + if ($db->getNumRows()) { - $_result = (string) $result; - $_result = json_decode($_result); - foreach ($_result as $name => &$rule) - { - $v = explode('.', $name); - if ($view !== $v[0]) - { - // remove since it is not part of this view - unset($_result->$name); - } - else - { - // clear the value since we inherit - $rule = array(); - } - } - // check if there are any view values remaining - if (count($_result)) - { - $_result = json_encode($_result); - $_result = array($_result); - // Instantiate and return the JAccessRules object for the asset rules. - $rules = new JAccessRules($_result); - - return $rules; - } - return $result; + // asset already set so use saved rules + $assetId = (int) $db->loadResult(); } } - return JAccess::getAssetRules(0); + // get asset rules + $result = JAccess::getAssetRules($assetId); + if ($result instanceof JAccessRules) + { + $_result = (string) $result; + $_result = json_decode($_result); + foreach ($_result as $name => &$rule) + { + $v = explode('.', $name); + if ($view !== $v[0]) + { + // remove since it is not part of this view + unset($_result->$name); + } + elseif ($inherit) + { + // clear the value since we inherit + $rule = array(); + } + } + // check if there are any view values remaining + if (count($_result)) + { + $_result = json_encode($_result); + $_result = array($_result); + // Instantiate and return the JAccessRules object for the asset rules. + $rules = new JAccessRules($_result); + // return filtered rules + return $rules; + } + } + return $result; } /** @@ -1358,6 +1371,46 @@ abstract class SupportgroupsHelper } } + /** + * get the field object + * + * @param array $attributes The array of attributes + * @param string $default The default of the field + * @param array $options The options to apply to the XML element + * + * @return object + * + */ + public static function getFieldObject(&$attributes, $default = '', $options = null) + { + // make sure we have attributes and a type value + if (self::checkArray($attributes) && isset($attributes['type'])) + { + // make sure the form helper class is loaded + if (!method_exists('JFormHelper', 'loadFieldType')) + { + jimport('joomla.form.form'); + } + // get field type + $field = JFormHelper::loadFieldType($attributes['type'],true); + // start field xml + $XML = new SimpleXMLElement(''); + // load the attributes + self::xmlAddAttributes($XML, $attributes); + // check if we have options + if (self::checkArray($options)) + { + // load the options + self::xmlAddOptions($XML, $options); + } + // setup the field + $field->setup($XML, $default); + // return the field object + return $field; + } + return false; + } + /** * Render Bool Button * @@ -1376,8 +1429,6 @@ abstract class SupportgroupsHelper $args = func_get_args(); // check if there is additional button class $additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time - // start the xml - $buttonXML = new SimpleXMLElement(''); // button attributes $buttonAttributes = array( 'type' => 'radio', @@ -1386,30 +1437,20 @@ abstract class SupportgroupsHelper 'class' => 'btn-group', 'filter' => 'INT', 'default' => isset($args[2]) ? (int) $args[2] : 0); - // load the haskey attributes - self::xmlAddAttributes($buttonXML, $buttonAttributes); // set the button options $buttonOptions = array( '1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES', '0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO'); - // load the button options - self::xmlAddOptions($buttonXML, $buttonOptions); - - // get the radio element - $button = JFormHelper::loadFieldType('radio'); - - // run - $button->setup($buttonXML, $buttonAttributes['default']); - - return $button->input; + // return the input + return self::getFieldObject($buttonAttributes, $buttonAttributes['default'], $buttonOptions)->input; } /** - * Check if have an json string + * Check if have an json string * - * @input string The json string to check + * @input string The json string to check * - * @returns bool true on success + * @returns bool true on success **/ public static function checkJson($string) { @@ -1422,11 +1463,11 @@ abstract class SupportgroupsHelper } /** - * Check if have an object with a length + * Check if have an object with a length * - * @input object The object to check + * @input object The object to check * - * @returns bool true on success + * @returns bool true on success **/ public static function checkObject($object) { @@ -1438,15 +1479,15 @@ abstract class SupportgroupsHelper } /** - * Check if have an array with a length + * Check if have an array with a length * - * @input array The array to check + * @input array The array to check * - * @returns bool true on success + * @returns bool/int number of items in array on success **/ public static function checkArray($array, $removeEmptyString = false) { - if (isset($array) && is_array($array) && count($array) > 0) + if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0) { // also make sure the empty strings are removed if ($removeEmptyString) @@ -1460,17 +1501,17 @@ abstract class SupportgroupsHelper } return self::checkArray($array, false); } - return true; + return $nr; } return false; } /** - * Check if have a string with a length + * Check if have a string with a length * - * @input string The string to check + * @input string The string to check * - * @returns bool true on success + * @returns bool true on success **/ public static function checkString($string) { @@ -1482,10 +1523,10 @@ abstract class SupportgroupsHelper } /** - * Check if we are connected - * Thanks https://stackoverflow.com/a/4860432/1429677 + * Check if we are connected + * Thanks https://stackoverflow.com/a/4860432/1429677 * - * @returns bool true on success + * @returns bool true on success **/ public static function isConnected() { @@ -1507,11 +1548,11 @@ abstract class SupportgroupsHelper } /** - * Merge an array of array's + * Merge an array of array's * - * @input array The arrays you would like to merge + * @input array The arrays you would like to merge * - * @returns array on success + * @returns array on success **/ public static function mergeArrays($arrays) { @@ -1537,11 +1578,11 @@ abstract class SupportgroupsHelper } /** - * Shorten a string + * Shorten a string * - * @input string The you would like to shorten + * @input string The you would like to shorten * - * @returns string on success + * @returns string on success **/ public static function shorten($string, $length = 40, $addTip = true) { @@ -1549,7 +1590,7 @@ abstract class SupportgroupsHelper { $initial = strlen($string); $words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE); - $words_count = count($words); + $words_count = count((array)$words); $word_length = 0; $last_word = 0; @@ -1578,13 +1619,13 @@ abstract class SupportgroupsHelper } /** - * Making strings safe (various ways) + * Making strings safe (various ways) * - * @input string The you would like to make safe + * @input string The you would like to make safe * - * @returns string on success + * @returns string on success **/ - public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true) + public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true) { if ($replaceNumbers === true) { @@ -1613,7 +1654,16 @@ abstract class SupportgroupsHelper $string = trim($string); $string = preg_replace('/'.$spacer.'+/', ' ', $string); $string = preg_replace('/\s+/', ' ', $string); - $string = preg_replace("/[^A-Za-z ]/", '', $string); + // remove all and keep only characters + if ($keepOnlyCharacters) + { + $string = preg_replace("/[^A-Za-z ]/", '', $string); + } + // keep both numbers and characters + else + { + $string = preg_replace("/[^A-Za-z0-9 ]/", '', $string); + } // select final adaptations if ($type === 'L' || $type === 'strtolower') { @@ -1713,11 +1763,11 @@ abstract class SupportgroupsHelper } /** - * Convert an integer into an English word string - * Thanks to Tom Nicholson + * Convert an integer into an English word string + * Thanks to Tom Nicholson * - * @input an int - * @returns a string + * @input an int + * @returns a string **/ public static function numberToString($x) { @@ -1804,9 +1854,9 @@ abstract class SupportgroupsHelper } /** - * Random Key + * Random Key * - * @returns a string + * @returns a string **/ public static function randomkey($size) { diff --git a/admin/language/en-GB/en-GB.com_supportgroups.ini b/admin/language/en-GB/en-GB.com_supportgroups.ini index fc009f6..08cc9e2 100644 --- a/admin/language/en-GB/en-GB.com_supportgroups.ini +++ b/admin/language/en-GB/en-GB.com_supportgroups.ini @@ -10,25 +10,25 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_BATCH_USE_DESC="Allows users in this gr COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE="Additional Information Create" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE_DESC="Allows the users in this group to create create additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD="Additional Information Dashboard Add" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST="Additional Information Dashboard List" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE="Additional Information Delete" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE_DESC="Allows the users in this group to delete delete additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT="Additional Information Edit" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS="Additional Information Edit Alias" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY="Additional Information Edit Created By" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE="Additional Information Edit Created Date" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DESC="Allows the users in this group to edit the additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS="Additional Information Edit Details" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to edit details of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE="Additional Information Edit Info Type" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to update the edit info type of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to edit info type of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME="Additional Information Edit Name" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to edit name of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN="Additional Information Edit Own" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN_DESC="Allows the users in this group to edit edit own additional information created by them" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_STATE="Additional Information Edit State" @@ -57,7 +57,7 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNFEATURED_1="%s Additional Inf COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNPUBLISHED="%s Additional Information unpublished." COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_N_ITEMS_UNPUBLISHED_1="%s Additional Info unpublished." COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU="Additional Information Submenu" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to update the submenu of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to submenu of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS="Alias" COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS_HINT="Auto-generated from name" COM_SUPPORTGROUPS_ADDITIONAL_INFO_ALIAS_LABEL="Alias" @@ -105,31 +105,31 @@ COM_SUPPORTGROUPS_AREAS_BATCH_USE_DESC="Allows users in this group to use batch COM_SUPPORTGROUPS_AREAS_CREATE="Areas Create" COM_SUPPORTGROUPS_AREAS_CREATE_DESC="Allows the users in this group to create create areas" COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD="Areas Dashboard Add" -COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the area" +COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of area" COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST="Areas Dashboard List" -COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the area" +COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of area" COM_SUPPORTGROUPS_AREAS_DELETE="Areas Delete" COM_SUPPORTGROUPS_AREAS_DELETE_DESC="Allows the users in this group to delete delete areas" COM_SUPPORTGROUPS_AREAS_EDIT="Areas Edit" COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS="Areas Edit Alias" -COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area" COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE="Areas Edit Area Type" -COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to update the edit area type of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to edit area type of area" COM_SUPPORTGROUPS_AREAS_EDIT_COLOR="Areas Edit Color" -COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to update the edit color of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to edit color of area" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY="Areas Edit Created By" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by areas" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE="Areas Edit Created Date" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created areas" COM_SUPPORTGROUPS_AREAS_EDIT_DESC="Allows the users in this group to edit the area" COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS="Areas Edit Details" -COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of area" COM_SUPPORTGROUPS_AREAS_EDIT_NAME="Areas Edit Name" -COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to edit name of area" COM_SUPPORTGROUPS_AREAS_EDIT_OWN="Areas Edit Own" COM_SUPPORTGROUPS_AREAS_EDIT_OWN_DESC="Allows the users in this group to edit edit own areas created by them" COM_SUPPORTGROUPS_AREAS_EDIT_REGION="Areas Edit Region" -COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to update the edit region of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to edit region of area" COM_SUPPORTGROUPS_AREAS_EDIT_STATE="Areas Edit State" COM_SUPPORTGROUPS_AREAS_EDIT_STATE_DESC="Allows the users in this group to update the state of the area" COM_SUPPORTGROUPS_AREAS_EDIT_VERSION="Areas Edit Version" @@ -156,7 +156,7 @@ COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNFEATURED_1="%s Area unfeatured." COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNPUBLISHED="%s Areas unpublished." COM_SUPPORTGROUPS_AREAS_N_ITEMS_UNPUBLISHED_1="%s Area unpublished." COM_SUPPORTGROUPS_AREAS_SUBMENU="Areas Submenu" -COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to update the submenu of the area" +COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to submenu of area" COM_SUPPORTGROUPS_AREA_ALIAS="Alias" COM_SUPPORTGROUPS_AREA_ALIAS_HINT="Auto-generated from name" COM_SUPPORTGROUPS_AREA_ALIAS_LABEL="Alias" @@ -209,14 +209,14 @@ COM_SUPPORTGROUPS_AREA_TYPES_DELETE="Area Types Delete" COM_SUPPORTGROUPS_AREA_TYPES_DELETE_DESC="Allows the users in this group to delete delete area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT="Area Types Edit" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS="Area Types Edit Alias" -COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area type" +COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY="Area Types Edit Created By" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE="Area Types Edit Created Date" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_DESC="Allows the users in this group to edit the area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME="Area Types Edit Name" -COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area type" +COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN="Area Types Edit Own" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own area types created by them" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_STATE="Area Types Edit State" @@ -361,7 +361,19 @@ COM_SUPPORTGROUPS_CONTRIBUTOR="Contributor" COM_SUPPORTGROUPS_CONTRIBUTORS="Contributors" COM_SUPPORTGROUPS_COUNTRIES="Countries" COM_SUPPORTGROUPS_COUNTRIES_ACCESS="Countries Access" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS="Countries Access Alias" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE="Countries Access Codethree" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC="Allows the users in this group to access codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO="Countries Access Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC="Allows the users in this group to access codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY="Countries Access Currency" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC="Allows the users in this group to access currency of country" COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC="Allows the users in this group to access access countries" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME="Countries Access Name" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC="Allows the users in this group to access name of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE="Countries Access Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC="Allows the users in this group to access worldzone of country" COM_SUPPORTGROUPS_COUNTRIES_BATCH_OPTIONS="Batch process the selected Countries" COM_SUPPORTGROUPS_COUNTRIES_BATCH_TIP="All changes will be applied to all selected Countries" COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE="Countries Batch Use" @@ -369,17 +381,29 @@ COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE_DESC="Allows users in this group to use ba COM_SUPPORTGROUPS_COUNTRIES_CREATE="Countries Create" COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC="Allows the users in this group to create create countries" COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST="Countries Dashboard List" -COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the country" +COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of country" COM_SUPPORTGROUPS_COUNTRIES_DELETE="Countries Delete" COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC="Allows the users in this group to delete delete countries" COM_SUPPORTGROUPS_COUNTRIES_EDIT="Countries Edit" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS="Countries Edit Alias" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE="Countries Edit Codethree" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC="Allows the users in this group to edit codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO="Countries Edit Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC="Allows the users in this group to edit codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY="Countries Edit Currency" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC="Allows the users in this group to edit currency of country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_DESC="Allows the users in this group to edit the country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME="Countries Edit Name" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC="Allows the users in this group to edit name of country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN="Countries Edit Own" COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own countries created by them" COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE="Countries Edit State" COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION="Countries Edit Version" COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version countries" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE="Countries Edit Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC="Allows the users in this group to edit worldzone of country" COM_SUPPORTGROUPS_COUNTRIES_EXPORT="Countries Export" COM_SUPPORTGROUPS_COUNTRIES_EXPORT_DESC="Allows the users in this group to export export countries" COM_SUPPORTGROUPS_COUNTRIES_IMPORT="Countries Import" @@ -402,7 +426,19 @@ COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNFEATURED_1="%s Country unfeatured." COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNPUBLISHED="%s Countries unpublished." COM_SUPPORTGROUPS_COUNTRIES_N_ITEMS_UNPUBLISHED_1="%s Country unpublished." COM_SUPPORTGROUPS_COUNTRIES_SUBMENU="Countries Submenu" -COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country" +COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS="Countries View Alias" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC="Allows the users in this group to view alias of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE="Countries View Codethree" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC="Allows the users in this group to view codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO="Countries View Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC="Allows the users in this group to view codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY="Countries View Currency" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC="Allows the users in this group to view currency of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME="Countries View Name" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC="Allows the users in this group to view name of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE="Countries View Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC="Allows the users in this group to view worldzone of country" COM_SUPPORTGROUPS_COUNTRY="Country" COM_SUPPORTGROUPS_COUNTRY_ALIAS="Alias" COM_SUPPORTGROUPS_COUNTRY_ALIAS_HINT="Auto-generated from name" @@ -462,7 +498,7 @@ COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE_DESC="Allows users in this group to use b COM_SUPPORTGROUPS_CURRENCIES_CREATE="Currencies Create" COM_SUPPORTGROUPS_CURRENCIES_CREATE_DESC="Allows the users in this group to create create currencies" COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST="Currencies Dashboard List" -COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the currency" +COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of currency" COM_SUPPORTGROUPS_CURRENCIES_DELETE="Currencies Delete" COM_SUPPORTGROUPS_CURRENCIES_DELETE_DESC="Allows the users in this group to delete delete currencies" COM_SUPPORTGROUPS_CURRENCIES_EDIT="Currencies Edit" @@ -495,7 +531,7 @@ COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNFEATURED_1="%s Currency unfeatured." COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNPUBLISHED="%s Currencies unpublished." COM_SUPPORTGROUPS_CURRENCIES_N_ITEMS_UNPUBLISHED_1="%s Currency unpublished." COM_SUPPORTGROUPS_CURRENCIES_SUBMENU="Currencies Submenu" -COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency" +COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_SUPPORTGROUPS_CURRENCY="Currency" COM_SUPPORTGROUPS_CURRENCY_ALIAS="Alias" COM_SUPPORTGROUPS_CURRENCY_ALIAS_HINT="Auto-generated from name" @@ -604,31 +640,31 @@ COM_SUPPORTGROUPS_FACILITIES_BATCH_USE_DESC="Allows users in this group to use b COM_SUPPORTGROUPS_FACILITIES_CREATE="Facilities Create" COM_SUPPORTGROUPS_FACILITIES_CREATE_DESC="Allows the users in this group to create create facilities" COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD="Facilities Dashboard Add" -COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the facility" +COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of facility" COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST="Facilities Dashboard List" -COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the facility" +COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of facility" COM_SUPPORTGROUPS_FACILITIES_DELETE="Facilities Delete" COM_SUPPORTGROUPS_FACILITIES_DELETE_DESC="Allows the users in this group to delete delete facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT="Facilities Edit" COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS="Facilities Edit Alias" -COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY="Facilities Edit Created By" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE="Facilities Edit Created Date" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT_DESC="Allows the users in this group to edit the facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS="Facilities Edit Details" -COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to edit details of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE="Facilities Edit Facility Type" -COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to update the edit facility type of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to edit facility type of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME="Facilities Edit Name" -COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER="Facilities Edit Note Set Marker" -COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to update the edit note set marker of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to edit note set marker of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN="Facilities Edit Own" COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facilities created by them" COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE="Facilities Edit Phone" -COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to edit phone of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE="Facilities Edit State" COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_VERSION="Facilities Edit Version" @@ -655,7 +691,7 @@ COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNFEATURED_1="%s Facility unfeatured." COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNPUBLISHED="%s Facilities unpublished." COM_SUPPORTGROUPS_FACILITIES_N_ITEMS_UNPUBLISHED_1="%s Facility unpublished." COM_SUPPORTGROUPS_FACILITIES_SUBMENU="Facilities Submenu" -COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the facility" +COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to submenu of facility" COM_SUPPORTGROUPS_FACILITY="Facility" COM_SUPPORTGROUPS_FACILITY_ALIAS="Alias" COM_SUPPORTGROUPS_FACILITY_ALIAS_HINT="Auto-generated from name" @@ -711,14 +747,14 @@ COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE="Facility Types Delete" COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE_DESC="Allows the users in this group to delete delete facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT="Facility Types Edit" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS="Facility Types Edit Alias" -COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility type" +COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY="Facility Types Edit Created By" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE="Facility Types Edit Created Date" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_DESC="Allows the users in this group to edit the facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME="Facility Types Edit Name" -COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility type" +COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN="Facility Types Edit Own" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facility types created by them" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_STATE="Facility Types Edit State" @@ -787,7 +823,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to u COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE="Help Documents Create" COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List" -COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document" +COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE="Help Documents Delete" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_EDIT="Help Documents Edit" @@ -820,7 +856,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNFEATURED_1="%s Help Document unfeatur COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED="%s Help Documents unpublished." COM_SUPPORTGROUPS_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED_1="%s Help Document unpublished." COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu" -COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document" +COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document" COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN="Admin" COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW="Admin View" COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being target." @@ -947,14 +983,14 @@ COM_SUPPORTGROUPS_INFO_TYPES_DELETE="Info Types Delete" COM_SUPPORTGROUPS_INFO_TYPES_DELETE_DESC="Allows the users in this group to delete delete info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT="Info Types Edit" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS="Info Types Edit Alias" -COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the info type" +COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY="Info Types Edit Created By" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE="Info Types Edit Created Date" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_DESC="Allows the users in this group to edit the info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME="Info Types Edit Name" -COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the info type" +COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN="Info Types Edit Own" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own info types created by them" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_STATE="Info Types Edit State" @@ -1031,14 +1067,14 @@ COM_SUPPORTGROUPS_PAYMENTS_BATCH_USE_DESC="Allows users in this group to use bat COM_SUPPORTGROUPS_PAYMENTS_CREATE="Payments Create" COM_SUPPORTGROUPS_PAYMENTS_CREATE_DESC="Allows the users in this group to create create payments" COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD="Payments Dashboard Add" -COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the payment" +COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of payment" COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST="Payments Dashboard List" -COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the payment" +COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of payment" COM_SUPPORTGROUPS_PAYMENTS_DELETE="Payments Delete" COM_SUPPORTGROUPS_PAYMENTS_DELETE_DESC="Allows the users in this group to delete delete payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT="Payments Edit" COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT="Payments Edit Amount" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to update the edit amount of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to edit amount of payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY="Payments Edit Created By" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_DATE="Payments Edit Created Date" @@ -1049,11 +1085,11 @@ COM_SUPPORTGROUPS_PAYMENTS_EDIT_OWN_DESC="Allows the users in this group to edit COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE="Payments Edit State" COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP="Payments Edit Support Group" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to update the edit support group of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to edit support group of payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION="Payments Edit Version" COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR="Payments Edit Year" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to update the edit year of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to edit year of payment" COM_SUPPORTGROUPS_PAYMENTS_EXPORT="Payments Export" COM_SUPPORTGROUPS_PAYMENTS_EXPORT_DESC="Allows the users in this group to export export payments" COM_SUPPORTGROUPS_PAYMENTS_IMPORT="Payments Import" @@ -1076,7 +1112,7 @@ COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNFEATURED_1="%s Payment unfeatured." COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNPUBLISHED="%s Payments unpublished." COM_SUPPORTGROUPS_PAYMENTS_N_ITEMS_UNPUBLISHED_1="%s Payment unpublished." COM_SUPPORTGROUPS_PAYMENTS_SUBMENU="Payments Submenu" -COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the payment" +COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to submenu of payment" COM_SUPPORTGROUPS_PAYMENT_AMOUNT="Amount" COM_SUPPORTGROUPS_PAYMENT_AMOUNT_DESCRIPTION="The amount paid." COM_SUPPORTGROUPS_PAYMENT_AMOUNT_HINT="Only Numbers & dot" @@ -1135,7 +1171,13 @@ COM_SUPPORTGROUPS_PUBLISHED="Published" COM_SUPPORTGROUPS_REGION="Region" COM_SUPPORTGROUPS_REGIONS="Regions" COM_SUPPORTGROUPS_REGIONS_ACCESS="Regions Access" +COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS="Regions Access Alias" +COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of region" +COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY="Regions Access Country" +COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of region" COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC="Allows the users in this group to access access regions" +COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME="Regions Access Name" +COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC="Allows the users in this group to access name of region" COM_SUPPORTGROUPS_REGIONS_BATCH_OPTIONS="Batch process the selected Regions" COM_SUPPORTGROUPS_REGIONS_BATCH_TIP="All changes will be applied to all selected Regions" COM_SUPPORTGROUPS_REGIONS_BATCH_USE="Regions Batch Use" @@ -1143,23 +1185,23 @@ COM_SUPPORTGROUPS_REGIONS_BATCH_USE_DESC="Allows users in this group to use batc COM_SUPPORTGROUPS_REGIONS_CREATE="Regions Create" COM_SUPPORTGROUPS_REGIONS_CREATE_DESC="Allows the users in this group to create create regions" COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD="Regions Dashboard Add" -COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the region" +COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of region" COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST="Regions Dashboard List" -COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the region" +COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of region" COM_SUPPORTGROUPS_REGIONS_DELETE="Regions Delete" COM_SUPPORTGROUPS_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions" COM_SUPPORTGROUPS_REGIONS_EDIT="Regions Edit" COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS="Regions Edit Alias" -COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region" COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY="Regions Edit Country" -COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY="Regions Edit Created By" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions" COM_SUPPORTGROUPS_REGIONS_EDIT_DESC="Allows the users in this group to edit the region" COM_SUPPORTGROUPS_REGIONS_EDIT_NAME="Regions Edit Name" -COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region" COM_SUPPORTGROUPS_REGIONS_EDIT_OWN="Regions Edit Own" COM_SUPPORTGROUPS_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them" COM_SUPPORTGROUPS_REGIONS_EDIT_STATE="Regions Edit State" @@ -1188,7 +1230,13 @@ COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNFEATURED_1="%s Region unfeatured." COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNPUBLISHED="%s Regions unpublished." COM_SUPPORTGROUPS_REGIONS_N_ITEMS_UNPUBLISHED_1="%s Region unpublished." COM_SUPPORTGROUPS_REGIONS_SUBMENU="Regions Submenu" -COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the region" +COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to submenu of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS="Regions View Alias" +COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC="Allows the users in this group to view alias of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY="Regions View Country" +COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_NAME="Regions View Name" +COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC="Allows the users in this group to view name of region" COM_SUPPORTGROUPS_REGION_ALIAS="Alias" COM_SUPPORTGROUPS_REGION_ALIAS_HINT="Auto-generated from name" COM_SUPPORTGROUPS_REGION_ALIAS_LABEL="Alias" @@ -1246,43 +1294,43 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_BATCH_USE_DESC="Allows users in this group to u COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE="Support Groups Create" COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE_DESC="Allows the users in this group to create create support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD="Support Groups Dashboard Add" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST="Support Groups Dashboard List" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE="Support Groups Delete" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE_DESC="Allows the users in this group to delete delete support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT="Support Groups Edit" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS="Support Groups Edit Alias" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA="Support Groups Edit Area" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to update the edit area of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to edit area of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY="Support Groups Edit Created By" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE="Support Groups Edit Created Date" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DESC="Allows the users in this group to edit the support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS="Support Groups Edit Details" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY="Support Groups Edit Facility" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to update the edit facility of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to edit facility of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE="Support Groups Edit Female" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART="Support Groups Edit Female Art" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to update the edit female art of the support group" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to update the edit female of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to edit female art of support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to edit female of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO="Support Groups Edit Info" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to update the edit info of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to edit info of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE="Support Groups Edit Male" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART="Support Groups Edit Male Art" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to update the edit male art of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to edit male art of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN="Support Groups Edit Male Children" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to update the edit male children of the support group" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to update the edit male of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to edit male children of support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to edit male of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME="Support Groups Edit Name" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to edit name of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN="Support Groups Edit Own" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN_DESC="Allows the users in this group to edit edit own support groups created by them" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE="Support Groups Edit Phone" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to edit phone of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE="Support Groups Edit State" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE_DESC="Allows the users in this group to update the state of the support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_VERSION="Support Groups Edit Version" @@ -1309,7 +1357,7 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNFEATURED_1="%s Support Group unfeatur COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNPUBLISHED="%s Support Groups unpublished." COM_SUPPORTGROUPS_SUPPORT_GROUPS_N_ITEMS_UNPUBLISHED_1="%s Support Group unpublished." COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU="Support Groups Submenu" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to update the submenu of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to submenu of support group" COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS="Alias" COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS_HINT="Auto-generated from name" COM_SUPPORTGROUPS_SUPPORT_GROUP_ALIAS_LABEL="Alias" diff --git a/admin/language/en-GB/en-GB.com_supportgroups.sys.ini b/admin/language/en-GB/en-GB.com_supportgroups.sys.ini index bb49569..a58270c 100644 --- a/admin/language/en-GB/en-GB.com_supportgroups.sys.ini +++ b/admin/language/en-GB/en-GB.com_supportgroups.sys.ini @@ -6,25 +6,25 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_BATCH_USE_DESC="Allows users in this gr COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE="Additional Information Create" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_CREATE_DESC="Allows the users in this group to create create additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD="Additional Information Dashboard Add" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST="Additional Information Dashboard List" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE="Additional Information Delete" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_DELETE_DESC="Allows the users in this group to delete delete additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT="Additional Information Edit" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS="Additional Information Edit Alias" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY="Additional Information Edit Created By" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE="Additional Information Edit Created Date" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DESC="Allows the users in this group to edit the additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS="Additional Information Edit Details" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_DETAILS_DESC="Allows the users in this group to edit details of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE="Additional Information Edit Info Type" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to update the edit info type of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_INFO_TYPE_DESC="Allows the users in this group to edit info type of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME="Additional Information Edit Name" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_NAME_DESC="Allows the users in this group to edit name of additional info" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN="Additional Information Edit Own" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_OWN_DESC="Allows the users in this group to edit edit own additional information created by them" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EDIT_STATE="Additional Information Edit State" @@ -36,7 +36,7 @@ COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_EXPORT_DESC="Allows the users in this g COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_IMPORT="Additional Information Import" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_IMPORT_DESC="Allows the users in this group to import import additional information" COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU="Additional Information Submenu" -COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to update the submenu of the additional info" +COM_SUPPORTGROUPS_ADDITIONAL_INFORMATION_SUBMENU_DESC="Allows the users in this group to submenu of additional info" COM_SUPPORTGROUPS_AREAS_ACCESS="Areas Access" COM_SUPPORTGROUPS_AREAS_ACCESS_DESC="Allows the users in this group to access access areas" COM_SUPPORTGROUPS_AREAS_BATCH_USE="Areas Batch Use" @@ -44,31 +44,31 @@ COM_SUPPORTGROUPS_AREAS_BATCH_USE_DESC="Allows users in this group to use batch COM_SUPPORTGROUPS_AREAS_CREATE="Areas Create" COM_SUPPORTGROUPS_AREAS_CREATE_DESC="Allows the users in this group to create create areas" COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD="Areas Dashboard Add" -COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the area" +COM_SUPPORTGROUPS_AREAS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of area" COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST="Areas Dashboard List" -COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the area" +COM_SUPPORTGROUPS_AREAS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of area" COM_SUPPORTGROUPS_AREAS_DELETE="Areas Delete" COM_SUPPORTGROUPS_AREAS_DELETE_DESC="Allows the users in this group to delete delete areas" COM_SUPPORTGROUPS_AREAS_EDIT="Areas Edit" COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS="Areas Edit Alias" -COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area" COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE="Areas Edit Area Type" -COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to update the edit area type of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_AREA_TYPE_DESC="Allows the users in this group to edit area type of area" COM_SUPPORTGROUPS_AREAS_EDIT_COLOR="Areas Edit Color" -COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to update the edit color of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_COLOR_DESC="Allows the users in this group to edit color of area" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY="Areas Edit Created By" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by areas" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE="Areas Edit Created Date" COM_SUPPORTGROUPS_AREAS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created areas" COM_SUPPORTGROUPS_AREAS_EDIT_DESC="Allows the users in this group to edit the area" COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS="Areas Edit Details" -COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of area" COM_SUPPORTGROUPS_AREAS_EDIT_NAME="Areas Edit Name" -COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_NAME_DESC="Allows the users in this group to edit name of area" COM_SUPPORTGROUPS_AREAS_EDIT_OWN="Areas Edit Own" COM_SUPPORTGROUPS_AREAS_EDIT_OWN_DESC="Allows the users in this group to edit edit own areas created by them" COM_SUPPORTGROUPS_AREAS_EDIT_REGION="Areas Edit Region" -COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to update the edit region of the area" +COM_SUPPORTGROUPS_AREAS_EDIT_REGION_DESC="Allows the users in this group to edit region of area" COM_SUPPORTGROUPS_AREAS_EDIT_STATE="Areas Edit State" COM_SUPPORTGROUPS_AREAS_EDIT_STATE_DESC="Allows the users in this group to update the state of the area" COM_SUPPORTGROUPS_AREAS_EDIT_VERSION="Areas Edit Version" @@ -78,7 +78,7 @@ COM_SUPPORTGROUPS_AREAS_EXPORT_DESC="Allows the users in this group to export ex COM_SUPPORTGROUPS_AREAS_IMPORT="Areas Import" COM_SUPPORTGROUPS_AREAS_IMPORT_DESC="Allows the users in this group to import import areas" COM_SUPPORTGROUPS_AREAS_SUBMENU="Areas Submenu" -COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to update the submenu of the area" +COM_SUPPORTGROUPS_AREAS_SUBMENU_DESC="Allows the users in this group to submenu of area" COM_SUPPORTGROUPS_AREA_TYPES_ACCESS="Area Types Access" COM_SUPPORTGROUPS_AREA_TYPES_ACCESS_DESC="Allows the users in this group to access access area types" COM_SUPPORTGROUPS_AREA_TYPES_BATCH_USE="Area Types Batch Use" @@ -89,14 +89,14 @@ COM_SUPPORTGROUPS_AREA_TYPES_DELETE="Area Types Delete" COM_SUPPORTGROUPS_AREA_TYPES_DELETE_DESC="Allows the users in this group to delete delete area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT="Area Types Edit" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS="Area Types Edit Alias" -COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the area type" +COM_SUPPORTGROUPS_AREA_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY="Area Types Edit Created By" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE="Area Types Edit Created Date" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created area types" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_DESC="Allows the users in this group to edit the area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME="Area Types Edit Name" -COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the area type" +COM_SUPPORTGROUPS_AREA_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of area type" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN="Area Types Edit Own" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own area types created by them" COM_SUPPORTGROUPS_AREA_TYPES_EDIT_STATE="Area Types Edit State" @@ -109,29 +109,65 @@ COM_SUPPORTGROUPS_AREA_TYPES_IMPORT="Area Types Import" COM_SUPPORTGROUPS_AREA_TYPES_IMPORT_DESC="Allows the users in this group to import import area types" COM_SUPPORTGROUPS_CONFIGURATION="Support Groups Configuration" COM_SUPPORTGROUPS_COUNTRIES_ACCESS="Countries Access" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS="Countries Access Alias" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE="Countries Access Codethree" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETHREE_DESC="Allows the users in this group to access codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO="Countries Access Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CODETWO_DESC="Allows the users in this group to access codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY="Countries Access Currency" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_CURRENCY_DESC="Allows the users in this group to access currency of country" COM_SUPPORTGROUPS_COUNTRIES_ACCESS_DESC="Allows the users in this group to access access countries" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME="Countries Access Name" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_NAME_DESC="Allows the users in this group to access name of country" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE="Countries Access Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_ACCESS_WORLDZONE_DESC="Allows the users in this group to access worldzone of country" COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE="Countries Batch Use" COM_SUPPORTGROUPS_COUNTRIES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch countries" COM_SUPPORTGROUPS_COUNTRIES_CREATE="Countries Create" COM_SUPPORTGROUPS_COUNTRIES_CREATE_DESC="Allows the users in this group to create create countries" COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST="Countries Dashboard List" -COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the country" +COM_SUPPORTGROUPS_COUNTRIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of country" COM_SUPPORTGROUPS_COUNTRIES_DELETE="Countries Delete" COM_SUPPORTGROUPS_COUNTRIES_DELETE_DESC="Allows the users in this group to delete delete countries" COM_SUPPORTGROUPS_COUNTRIES_EDIT="Countries Edit" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS="Countries Edit Alias" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE="Countries Edit Codethree" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETHREE_DESC="Allows the users in this group to edit codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO="Countries Edit Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CODETWO_DESC="Allows the users in this group to edit codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY="Countries Edit Currency" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_CURRENCY_DESC="Allows the users in this group to edit currency of country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_DESC="Allows the users in this group to edit the country" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME="Countries Edit Name" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_NAME_DESC="Allows the users in this group to edit name of country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN="Countries Edit Own" COM_SUPPORTGROUPS_COUNTRIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own countries created by them" COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE="Countries Edit State" COM_SUPPORTGROUPS_COUNTRIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the country" COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION="Countries Edit Version" COM_SUPPORTGROUPS_COUNTRIES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version countries" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE="Countries Edit Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_EDIT_WORLDZONE_DESC="Allows the users in this group to edit worldzone of country" COM_SUPPORTGROUPS_COUNTRIES_EXPORT="Countries Export" COM_SUPPORTGROUPS_COUNTRIES_EXPORT_DESC="Allows the users in this group to export export countries" COM_SUPPORTGROUPS_COUNTRIES_IMPORT="Countries Import" COM_SUPPORTGROUPS_COUNTRIES_IMPORT_DESC="Allows the users in this group to import import countries" COM_SUPPORTGROUPS_COUNTRIES_SUBMENU="Countries Submenu" -COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country" +COM_SUPPORTGROUPS_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS="Countries View Alias" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_ALIAS_DESC="Allows the users in this group to view alias of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE="Countries View Codethree" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETHREE_DESC="Allows the users in this group to view codethree of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO="Countries View Codetwo" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CODETWO_DESC="Allows the users in this group to view codetwo of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY="Countries View Currency" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_CURRENCY_DESC="Allows the users in this group to view currency of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME="Countries View Name" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_NAME_DESC="Allows the users in this group to view name of country" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE="Countries View Worldzone" +COM_SUPPORTGROUPS_COUNTRIES_VIEW_WORLDZONE_DESC="Allows the users in this group to view worldzone of country" COM_SUPPORTGROUPS_CURRENCIES_ACCESS="Currencies Access" COM_SUPPORTGROUPS_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies" COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE="Currencies Batch Use" @@ -139,7 +175,7 @@ COM_SUPPORTGROUPS_CURRENCIES_BATCH_USE_DESC="Allows users in this group to use b COM_SUPPORTGROUPS_CURRENCIES_CREATE="Currencies Create" COM_SUPPORTGROUPS_CURRENCIES_CREATE_DESC="Allows the users in this group to create create currencies" COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST="Currencies Dashboard List" -COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the currency" +COM_SUPPORTGROUPS_CURRENCIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of currency" COM_SUPPORTGROUPS_CURRENCIES_DELETE="Currencies Delete" COM_SUPPORTGROUPS_CURRENCIES_DELETE_DESC="Allows the users in this group to delete delete currencies" COM_SUPPORTGROUPS_CURRENCIES_EDIT="Currencies Edit" @@ -155,7 +191,7 @@ COM_SUPPORTGROUPS_CURRENCIES_EXPORT_DESC="Allows the users in this group to expo COM_SUPPORTGROUPS_CURRENCIES_IMPORT="Currencies Import" COM_SUPPORTGROUPS_CURRENCIES_IMPORT_DESC="Allows the users in this group to import import currencies" COM_SUPPORTGROUPS_CURRENCIES_SUBMENU="Currencies Submenu" -COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency" +COM_SUPPORTGROUPS_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_SUPPORTGROUPS_EDIT_CREATED_BY="Edit Created By" COM_SUPPORTGROUPS_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." COM_SUPPORTGROUPS_EDIT_CREATED_DATE="Edit Created Date" @@ -171,31 +207,31 @@ COM_SUPPORTGROUPS_FACILITIES_BATCH_USE_DESC="Allows users in this group to use b COM_SUPPORTGROUPS_FACILITIES_CREATE="Facilities Create" COM_SUPPORTGROUPS_FACILITIES_CREATE_DESC="Allows the users in this group to create create facilities" COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD="Facilities Dashboard Add" -COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the facility" +COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of facility" COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST="Facilities Dashboard List" -COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the facility" +COM_SUPPORTGROUPS_FACILITIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of facility" COM_SUPPORTGROUPS_FACILITIES_DELETE="Facilities Delete" COM_SUPPORTGROUPS_FACILITIES_DELETE_DESC="Allows the users in this group to delete delete facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT="Facilities Edit" COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS="Facilities Edit Alias" -COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY="Facilities Edit Created By" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE="Facilities Edit Created Date" COM_SUPPORTGROUPS_FACILITIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facilities" COM_SUPPORTGROUPS_FACILITIES_EDIT_DESC="Allows the users in this group to edit the facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS="Facilities Edit Details" -COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_DETAILS_DESC="Allows the users in this group to edit details of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE="Facilities Edit Facility Type" -COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to update the edit facility type of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_FACILITY_TYPE_DESC="Allows the users in this group to edit facility type of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME="Facilities Edit Name" -COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER="Facilities Edit Note Set Marker" -COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to update the edit note set marker of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_NOTE_SET_MARKER_DESC="Allows the users in this group to edit note set marker of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN="Facilities Edit Own" COM_SUPPORTGROUPS_FACILITIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facilities created by them" COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE="Facilities Edit Phone" -COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the facility" +COM_SUPPORTGROUPS_FACILITIES_EDIT_PHONE_DESC="Allows the users in this group to edit phone of facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE="Facilities Edit State" COM_SUPPORTGROUPS_FACILITIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the facility" COM_SUPPORTGROUPS_FACILITIES_EDIT_VERSION="Facilities Edit Version" @@ -205,7 +241,7 @@ COM_SUPPORTGROUPS_FACILITIES_EXPORT_DESC="Allows the users in this group to expo COM_SUPPORTGROUPS_FACILITIES_IMPORT="Facilities Import" COM_SUPPORTGROUPS_FACILITIES_IMPORT_DESC="Allows the users in this group to import import facilities" COM_SUPPORTGROUPS_FACILITIES_SUBMENU="Facilities Submenu" -COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the facility" +COM_SUPPORTGROUPS_FACILITIES_SUBMENU_DESC="Allows the users in this group to submenu of facility" COM_SUPPORTGROUPS_FACILITY_TYPES_ACCESS="Facility Types Access" COM_SUPPORTGROUPS_FACILITY_TYPES_ACCESS_DESC="Allows the users in this group to access access facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_BATCH_USE="Facility Types Batch Use" @@ -216,14 +252,14 @@ COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE="Facility Types Delete" COM_SUPPORTGROUPS_FACILITY_TYPES_DELETE_DESC="Allows the users in this group to delete delete facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT="Facility Types Edit" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS="Facility Types Edit Alias" -COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the facility type" +COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY="Facility Types Edit Created By" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE="Facility Types Edit Created Date" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created facility types" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_DESC="Allows the users in this group to edit the facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME="Facility Types Edit Name" -COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the facility type" +COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of facility type" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN="Facility Types Edit Own" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own facility types created by them" COM_SUPPORTGROUPS_FACILITY_TYPES_EDIT_STATE="Facility Types Edit State" @@ -241,7 +277,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to u COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE="Help Documents Create" COM_SUPPORTGROUPS_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List" -COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document" +COM_SUPPORTGROUPS_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE="Help Documents Delete" COM_SUPPORTGROUPS_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_EDIT="Help Documents Edit" @@ -257,7 +293,7 @@ COM_SUPPORTGROUPS_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to COM_SUPPORTGROUPS_HELP_DOCUMENTS_IMPORT="Help Documents Import" COM_SUPPORTGROUPS_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu" -COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document" +COM_SUPPORTGROUPS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document" COM_SUPPORTGROUPS_IMPORT_DATA="Import Data" COM_SUPPORTGROUPS_IMPORT_DATA_DESC=" Allows users in this group to import data." COM_SUPPORTGROUPS_INFO_TYPES_ACCESS="Info Types Access" @@ -270,14 +306,14 @@ COM_SUPPORTGROUPS_INFO_TYPES_DELETE="Info Types Delete" COM_SUPPORTGROUPS_INFO_TYPES_DELETE_DESC="Allows the users in this group to delete delete info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT="Info Types Edit" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS="Info Types Edit Alias" -COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the info type" +COM_SUPPORTGROUPS_INFO_TYPES_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY="Info Types Edit Created By" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE="Info Types Edit Created Date" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created info types" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_DESC="Allows the users in this group to edit the info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME="Info Types Edit Name" -COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the info type" +COM_SUPPORTGROUPS_INFO_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of info type" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN="Info Types Edit Own" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own info types created by them" COM_SUPPORTGROUPS_INFO_TYPES_EDIT_STATE="Info Types Edit State" @@ -309,14 +345,14 @@ COM_SUPPORTGROUPS_PAYMENTS_BATCH_USE_DESC="Allows users in this group to use bat COM_SUPPORTGROUPS_PAYMENTS_CREATE="Payments Create" COM_SUPPORTGROUPS_PAYMENTS_CREATE_DESC="Allows the users in this group to create create payments" COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD="Payments Dashboard Add" -COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the payment" +COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of payment" COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST="Payments Dashboard List" -COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the payment" +COM_SUPPORTGROUPS_PAYMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of payment" COM_SUPPORTGROUPS_PAYMENTS_DELETE="Payments Delete" COM_SUPPORTGROUPS_PAYMENTS_DELETE_DESC="Allows the users in this group to delete delete payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT="Payments Edit" COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT="Payments Edit Amount" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to update the edit amount of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_AMOUNT_DESC="Allows the users in this group to edit amount of payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY="Payments Edit Created By" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT_CREATED_DATE="Payments Edit Created Date" @@ -327,41 +363,47 @@ COM_SUPPORTGROUPS_PAYMENTS_EDIT_OWN_DESC="Allows the users in this group to edit COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE="Payments Edit State" COM_SUPPORTGROUPS_PAYMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP="Payments Edit Support Group" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to update the edit support group of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_SUPPORT_GROUP_DESC="Allows the users in this group to edit support group of payment" COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION="Payments Edit Version" COM_SUPPORTGROUPS_PAYMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version payments" COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR="Payments Edit Year" -COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to update the edit year of the payment" +COM_SUPPORTGROUPS_PAYMENTS_EDIT_YEAR_DESC="Allows the users in this group to edit year of payment" COM_SUPPORTGROUPS_PAYMENTS_EXPORT="Payments Export" COM_SUPPORTGROUPS_PAYMENTS_EXPORT_DESC="Allows the users in this group to export export payments" COM_SUPPORTGROUPS_PAYMENTS_IMPORT="Payments Import" COM_SUPPORTGROUPS_PAYMENTS_IMPORT_DESC="Allows the users in this group to import import payments" COM_SUPPORTGROUPS_PAYMENTS_SUBMENU="Payments Submenu" -COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the payment" +COM_SUPPORTGROUPS_PAYMENTS_SUBMENU_DESC="Allows the users in this group to submenu of payment" COM_SUPPORTGROUPS_REGIONS_ACCESS="Regions Access" +COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS="Regions Access Alias" +COM_SUPPORTGROUPS_REGIONS_ACCESS_ALIAS_DESC="Allows the users in this group to access alias of region" +COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY="Regions Access Country" +COM_SUPPORTGROUPS_REGIONS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of region" COM_SUPPORTGROUPS_REGIONS_ACCESS_DESC="Allows the users in this group to access access regions" +COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME="Regions Access Name" +COM_SUPPORTGROUPS_REGIONS_ACCESS_NAME_DESC="Allows the users in this group to access name of region" COM_SUPPORTGROUPS_REGIONS_BATCH_USE="Regions Batch Use" COM_SUPPORTGROUPS_REGIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch regions" COM_SUPPORTGROUPS_REGIONS_CREATE="Regions Create" COM_SUPPORTGROUPS_REGIONS_CREATE_DESC="Allows the users in this group to create create regions" COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD="Regions Dashboard Add" -COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the region" +COM_SUPPORTGROUPS_REGIONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of region" COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST="Regions Dashboard List" -COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the region" +COM_SUPPORTGROUPS_REGIONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of region" COM_SUPPORTGROUPS_REGIONS_DELETE="Regions Delete" COM_SUPPORTGROUPS_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions" COM_SUPPORTGROUPS_REGIONS_EDIT="Regions Edit" COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS="Regions Edit Alias" -COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region" COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY="Regions Edit Country" -COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY="Regions Edit Created By" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date" COM_SUPPORTGROUPS_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions" COM_SUPPORTGROUPS_REGIONS_EDIT_DESC="Allows the users in this group to edit the region" COM_SUPPORTGROUPS_REGIONS_EDIT_NAME="Regions Edit Name" -COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region" +COM_SUPPORTGROUPS_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region" COM_SUPPORTGROUPS_REGIONS_EDIT_OWN="Regions Edit Own" COM_SUPPORTGROUPS_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them" COM_SUPPORTGROUPS_REGIONS_EDIT_STATE="Regions Edit State" @@ -373,7 +415,13 @@ COM_SUPPORTGROUPS_REGIONS_EXPORT_DESC="Allows the users in this group to export COM_SUPPORTGROUPS_REGIONS_IMPORT="Regions Import" COM_SUPPORTGROUPS_REGIONS_IMPORT_DESC="Allows the users in this group to import import regions" COM_SUPPORTGROUPS_REGIONS_SUBMENU="Regions Submenu" -COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the region" +COM_SUPPORTGROUPS_REGIONS_SUBMENU_DESC="Allows the users in this group to submenu of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS="Regions View Alias" +COM_SUPPORTGROUPS_REGIONS_VIEW_ALIAS_DESC="Allows the users in this group to view alias of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY="Regions View Country" +COM_SUPPORTGROUPS_REGIONS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of region" +COM_SUPPORTGROUPS_REGIONS_VIEW_NAME="Regions View Name" +COM_SUPPORTGROUPS_REGIONS_VIEW_NAME_DESC="Allows the users in this group to view name of region" COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS="Support Groups Access" COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_DESC="Allows the users in this group to access access support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_ACCESS_SITE="Support Groups (Site) Access" @@ -383,43 +431,43 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_BATCH_USE_DESC="Allows users in this group to u COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE="Support Groups Create" COM_SUPPORTGROUPS_SUPPORT_GROUPS_CREATE_DESC="Allows the users in this group to create create support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD="Support Groups Dashboard Add" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST="Support Groups Dashboard List" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE="Support Groups Delete" COM_SUPPORTGROUPS_SUPPORT_GROUPS_DELETE_DESC="Allows the users in this group to delete delete support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT="Support Groups Edit" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS="Support Groups Edit Alias" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA="Support Groups Edit Area" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to update the edit area of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_AREA_DESC="Allows the users in this group to edit area of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY="Support Groups Edit Created By" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE="Support Groups Edit Created Date" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DESC="Allows the users in this group to edit the support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS="Support Groups Edit Details" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to update the edit details of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_DETAILS_DESC="Allows the users in this group to edit details of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY="Support Groups Edit Facility" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to update the edit facility of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FACILITY_DESC="Allows the users in this group to edit facility of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE="Support Groups Edit Female" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART="Support Groups Edit Female Art" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to update the edit female art of the support group" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to update the edit female of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_ART_DESC="Allows the users in this group to edit female art of support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_FEMALE_DESC="Allows the users in this group to edit female of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO="Support Groups Edit Info" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to update the edit info of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_INFO_DESC="Allows the users in this group to edit info of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE="Support Groups Edit Male" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART="Support Groups Edit Male Art" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to update the edit male art of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_ART_DESC="Allows the users in this group to edit male art of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN="Support Groups Edit Male Children" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to update the edit male children of the support group" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to update the edit male of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_CHILDREN_DESC="Allows the users in this group to edit male children of support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_MALE_DESC="Allows the users in this group to edit male of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME="Support Groups Edit Name" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_NAME_DESC="Allows the users in this group to edit name of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN="Support Groups Edit Own" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_OWN_DESC="Allows the users in this group to edit edit own support groups created by them" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE="Support Groups Edit Phone" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to update the edit phone of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_PHONE_DESC="Allows the users in this group to edit phone of support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE="Support Groups Edit State" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_STATE_DESC="Allows the users in this group to update the state of the support group" COM_SUPPORTGROUPS_SUPPORT_GROUPS_EDIT_VERSION="Support Groups Edit Version" @@ -429,7 +477,7 @@ COM_SUPPORTGROUPS_SUPPORT_GROUPS_EXPORT_DESC="Allows the users in this group to COM_SUPPORTGROUPS_SUPPORT_GROUPS_IMPORT="Support Groups Import" COM_SUPPORTGROUPS_SUPPORT_GROUPS_IMPORT_DESC="Allows the users in this group to import import support groups" COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU="Support Groups Submenu" -COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to update the submenu of the support group" +COM_SUPPORTGROUPS_SUPPORT_GROUPS_SUBMENU_DESC="Allows the users in this group to submenu of support group" COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS="Support Group Smart Export Button Access" COM_SUPPORTGROUPS_SUPPORT_GROUP_SMART_EXPORT_BUTTON_ACCESS_DESC=" Allows the users in this group to access the smart export button." COM_SUPPORTGROUPS_USE_BATCH="Use Batch" diff --git a/admin/layouts/additional_info/metadata.php b/admin/layouts/additional_info/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/additional_info/metadata.php +++ b/admin/layouts/additional_info/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/additional_info/publishing.php b/admin/layouts/additional_info/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/additional_info/publishing.php +++ b/admin/layouts/additional_info/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/additional_info/settings_above.php b/admin/layouts/additional_info/settings_above.php index 670c08b..2495936 100644 --- a/admin/layouts/additional_info/settings_above.php +++ b/admin/layouts/additional_info/settings_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/additional_info/settings_fullwidth.php b/admin/layouts/additional_info/settings_fullwidth.php index 7f05058..38f0130 100644 --- a/admin/layouts/additional_info/settings_fullwidth.php +++ b/admin/layouts/additional_info/settings_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'details' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/additional_info/settings_left.php b/admin/layouts/additional_info/settings_left.php index a3bc735..136a50d 100644 --- a/admin/layouts/additional_info/settings_left.php +++ b/admin/layouts/additional_info/settings_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/additional_info/support_groups_fullwidth.php b/admin/layouts/additional_info/support_groups_fullwidth.php index be4dd43..db82dc1 100644 --- a/admin/layouts/additional_info/support_groups_fullwidth.php +++ b/admin/layouts/additional_info/support_groups_fullwidth.php @@ -6,32 +6,50 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage support_groups_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vvwsupport_groups; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit"; +$items = $displayData->vvwsupport_groups; +$user = JFactory::getUser(); +$id = $displayData->item->id; +// set the edit URL +$edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit"; +// set a return value +$return = ($id) ? "index.php?option=com_supportgroups&view=additional_info&layout=edit&id=" . $id : ""; +// check for a return value +$jinput = JFactory::getApplication()->input; +if ($_return = $jinput->get('return', null, 'base64')) +{ + $return .= "&return=" . $_return; +} +// check if return value was set +if (SupportgroupsHelper::checkString($return)) +{ + // set the referral values + $ref = ($id) ? "&ref=additional_info&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return)); +} +else +{ + $ref = ($id) ? "&ref=additional_info&refid=" . $id : ""; +} ?>
@@ -73,31 +91,31 @@ $edit = "index.php?option=com_supportgroups&view=support_groups&task=support_gro $canDo = SupportgroupsHelper::getActions('support_group',$item,'support_groups'); ?> - + get('support_group.edit')): ?> - escape($item->name); ?> - checked_out): ?> - name, $item->checked_out_time, 'support_groups.', $canCheckin); ?> - + escape($item->name); ?> + checked_out): ?> + name, $item->checked_out_time, 'support_groups.', $canCheckin); ?> + -
escape($item->name); ?>
+ escape($item->name); ?> escape($item->phone); ?> - + authorise('area.edit', 'com_supportgroups.area.' . (int)$item->area)): ?> - escape($item->area_name); ?> + escape($item->area_name); ?> -
escape($item->area_name); ?>
+ escape($item->area_name); ?> - + authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?> - escape($item->facility_name); ?> + escape($item->facility_name); ?> -
escape($item->facility_name); ?>
+ escape($item->facility_name); ?> diff --git a/admin/layouts/area/metadata.php b/admin/layouts/area/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/area/metadata.php +++ b/admin/layouts/area/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/area/publishing.php b/admin/layouts/area/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/area/publishing.php +++ b/admin/layouts/area/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area/settings_above.php b/admin/layouts/area/settings_above.php index 5901e5d..8420fa4 100644 --- a/admin/layouts/area/settings_above.php +++ b/admin/layouts/area/settings_above.php @@ -6,38 +6,42 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias', 'area_type' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/area/settings_fullwidth.php b/admin/layouts/area/settings_fullwidth.php index 7f05058..38f0130 100644 --- a/admin/layouts/area/settings_fullwidth.php +++ b/admin/layouts/area/settings_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'details' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/area/settings_left.php b/admin/layouts/area/settings_left.php index 21a5603..67e3d79 100644 --- a/admin/layouts/area/settings_left.php +++ b/admin/layouts/area/settings_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area/settings_right.php b/admin/layouts/area/settings_right.php index 5e245da..880b63c 100644 --- a/admin/layouts/area/settings_right.php +++ b/admin/layouts/area/settings_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area/support_groups_fullwidth.php b/admin/layouts/area/support_groups_fullwidth.php index 8ad7b2e..574409f 100644 --- a/admin/layouts/area/support_groups_fullwidth.php +++ b/admin/layouts/area/support_groups_fullwidth.php @@ -6,34 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage support_groups_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vvxsupport_groups; -$user = JFactory::getUser(); -$id = $displayData->item->id; +$items = $displayData->vvxsupport_groups; +$user = JFactory::getUser(); +$id = $displayData->item->id; +// set the edit URL $edit = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit"; -$ref = ($id) ? "&ref=area&refid=".$id : ""; -$new = "index.php?option=com_supportgroups&view=support_group&layout=edit".$ref; +// set a return value +$return = ($id) ? "index.php?option=com_supportgroups&view=area&layout=edit&id=" . $id : ""; +// check for a return value +$jinput = JFactory::getApplication()->input; +if ($_return = $jinput->get('return', null, 'base64')) +{ + $return .= "&return=" . $_return; +} +// check if return value was set +if (SupportgroupsHelper::checkString($return)) +{ + // set the referral values + $ref = ($id) ? "&ref=area&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return)); +} +else +{ + $ref = ($id) ? "&ref=area&refid=" . $id : ""; +} +// set the create new URL +$new = "index.php?option=com_supportgroups&view=support_groups&task=support_group.edit" . $ref; +// load the action object $can = SupportgroupsHelper::getActions('support_group'); ?> @@ -79,14 +98,14 @@ $can = SupportgroupsHelper::getActions('support_group'); $canDo = SupportgroupsHelper::getActions('support_group',$item,'support_groups'); ?> - + get('support_group.edit')): ?> - escape($item->name); ?> - checked_out): ?> - name, $item->checked_out_time, 'support_groups.', $canCheckin); ?> - + escape($item->name); ?> + checked_out): ?> + name, $item->checked_out_time, 'support_groups.', $canCheckin); ?> + -
escape($item->name); ?>
+ escape($item->name); ?> @@ -95,11 +114,11 @@ $can = SupportgroupsHelper::getActions('support_group'); escape($item->area_name); ?> - + authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?> - escape($item->facility_name); ?> + escape($item->facility_name); ?> -
escape($item->facility_name); ?>
+ escape($item->facility_name); ?> diff --git a/admin/layouts/area_type/details_left.php b/admin/layouts/area_type/details_left.php index d6a6ca3..7577b1a 100644 --- a/admin/layouts/area_type/details_left.php +++ b/admin/layouts/area_type/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area_type/details_right.php b/admin/layouts/area_type/details_right.php index ed92110..a2a6d7b 100644 --- a/admin/layouts/area_type/details_right.php +++ b/admin/layouts/area_type/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area_type/publishing.php b/admin/layouts/area_type/publishing.php index 311b53c..a2d1048 100644 --- a/admin/layouts/area_type/publishing.php +++ b/admin/layouts/area_type/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/area_type/publlshing.php b/admin/layouts/area_type/publlshing.php index 1c1a486..0e7854a 100644 --- a/admin/layouts/area_type/publlshing.php +++ b/admin/layouts/area_type/publlshing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9de95ea..735f864 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -6,29 +6,29 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage batchselection.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('JPATH_BASE') or die; JHtmlBehavior::core(); -$divWrapper = range(1,120,2); -$counter = 0; +$divWrapper = range(1,120,2); +$counter = 0; ?> ListSelection) : ?>
diff --git a/admin/layouts/country/metadata.php b/admin/layouts/country/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/country/metadata.php +++ b/admin/layouts/country/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/regions_fullwidth.php b/admin/layouts/country/regions_fullwidth.php index a881f33..38871d7 100644 --- a/admin/layouts/country/regions_fullwidth.php +++ b/admin/layouts/country/regions_fullwidth.php @@ -6,40 +6,64 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage regions_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vvyregions; -$user = JFactory::getUser(); -$id = $displayData->item->id; +$items = $displayData->vvyregions; +$user = JFactory::getUser(); +$id = $displayData->item->id; +// set the edit URL $edit = "index.php?option=com_supportgroups&view=regions&task=region.edit"; -$ref = ($id) ? "&ref=country&refid=".$id : ""; -$new = "index.php?option=com_supportgroups&view=region&layout=edit".$ref; +// set a return value +$return = ($id) ? "index.php?option=com_supportgroups&view=country&layout=edit&id=" . $id : ""; +// check for a return value +$jinput = JFactory::getApplication()->input; +if ($_return = $jinput->get('return', null, 'base64')) +{ + $return .= "&return=" . $_return; +} +// check if return value was set +if (SupportgroupsHelper::checkString($return)) +{ + // set the referral values + $ref = ($id) ? "&ref=country&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return)); +} +else +{ + $ref = ($id) ? "&ref=country&refid=" . $id : ""; +} +// set the create new URL +$new = "index.php?option=com_supportgroups&view=regions&task=region.edit" . $ref; +// set the create new and close URL +$close_new = "index.php?option=com_supportgroups&view=regions&task=region.edit"; +// load the action object $can = SupportgroupsHelper::getActions('region'); ?>
get('region.create')): ?> -

+
+ + +


@@ -67,14 +91,14 @@ $can = SupportgroupsHelper::getActions('region'); $canDo = SupportgroupsHelper::getActions('region',$item,'regions'); ?> - - diff --git a/admin/views/additional_information/tmpl/default_head.php b/admin/views/additional_information/tmpl/default_head.php index f579fb1..9906368 100644 --- a/admin/views/additional_information/tmpl/default_head.php +++ b/admin/views/additional_information/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/additional_information/tmpl/default_toolbar.php b/admin/views/additional_information/tmpl/default_toolbar.php index a9849da..80f52db 100644 --- a/admin/views/additional_information/tmpl/default_toolbar.php +++ b/admin/views/additional_information/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/additional_information/view.html.php b/admin/views/additional_information/view.html.php index 73e3101..6468cb4 100644 --- a/admin/views/additional_information/view.html.php +++ b/admin/views/additional_information/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Additional_information */ @@ -54,6 +51,8 @@ class SupportgroupsViewAdditional_information extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('additional_info'); $this->canEdit = $this->canDo->get('additional_info.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewAdditional_information extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewAdditional_information extends JViewLegacy { JToolBarHelper::custom('additional_information.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('additional_info.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewAdditional_information extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Info Type Name Selection - $this->info_typeNameOptions = JFormHelper::loadFieldType('Infotype')->getOptions(); + $this->info_typeNameOptions = JFormHelper::loadFieldType('Infotype')->options; if ($this->info_typeNameOptions) { // Info Type Name Filter diff --git a/admin/views/area/submitbutton.js b/admin/views/area/submitbutton.js index 13050f8..f7ba90a 100644 --- a/admin/views/area/submitbutton.js +++ b/admin/views/area/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -69,6 +69,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups'); + ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'areaTab'; ?> + + canDo->get('area.delete') || $this->canDo->get('area.edit.created_by') || $this->canDo->get('area.edit.state') || $this->canDo->get('area.edit.created')) : ?>
diff --git a/admin/views/area/view.html.php b/admin/views/area/view.html.php index eadbc77..ba2cb0f 100644 --- a/admin/views/area/view.html.php +++ b/admin/views/area/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Area View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewArea extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('area',$this->item); + $this->canDo = SupportgroupsHelper::getActions('area', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Get Linked view data @@ -95,7 +102,7 @@ class SupportgroupsViewArea extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_AREA_NEW' : 'COM_SUPPORTGROUPS_AREA_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('area.create') && $isNew) { @@ -197,7 +204,7 @@ class SupportgroupsViewArea extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_AREA_NEW' : 'COM_SUPPORTGROUPS_AREA_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/area.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/area.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the CSS for Footable $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); diff --git a/admin/views/area_type/submitbutton.js b/admin/views/area_type/submitbutton.js index e2db62d..4576c0c 100644 --- a/admin/views/area_type/submitbutton.js +++ b/admin/views/area_type/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -51,6 +51,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups');
+ ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'area_typeTab'; ?> + + canDo->get('area_type.delete') || $this->canDo->get('area_type.edit.created_by') || $this->canDo->get('area_type.edit.state') || $this->canDo->get('area_type.edit.created')) : ?>
diff --git a/admin/views/area_type/view.html.php b/admin/views/area_type/view.html.php index 3eeefa4..4ae9460 100644 --- a/admin/views/area_type/view.html.php +++ b/admin/views/area_type/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Area_type View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewArea_type extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('area_type',$this->item); + $this->canDo = SupportgroupsHelper::getActions('area_type', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Set the toolbar @@ -92,7 +99,7 @@ class SupportgroupsViewArea_type extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_AREA_TYPE_NEW' : 'COM_SUPPORTGROUPS_AREA_TYPE_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('area_type.create') && $isNew) { @@ -194,7 +201,7 @@ class SupportgroupsViewArea_type extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_AREA_TYPE_NEW' : 'COM_SUPPORTGROUPS_AREA_TYPE_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/area_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/area_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addScript(JURI::root() . $this->script, (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); $this->document->addScript(JURI::root() . "administrator/components/com_supportgroups/views/area_type/submitbutton.js", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JText::script('view not acceptable. Error'); diff --git a/admin/views/area_types/tmpl/default.php b/admin/views/area_types/tmpl/default.php index 73f44a6..6796328 100644 --- a/admin/views/area_types/tmpl/default.php +++ b/admin/views/area_types/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/area_types/tmpl/default_batch_body.php b/admin/views/area_types/tmpl/default_batch_body.php index e146f74..49aade4 100644 --- a/admin/views/area_types/tmpl/default_batch_body.php +++ b/admin/views/area_types/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/area_types/tmpl/default_batch_footer.php b/admin/views/area_types/tmpl/default_batch_footer.php index b79bdea..ea2cb96 100644 --- a/admin/views/area_types/tmpl/default_batch_footer.php +++ b/admin/views/area_types/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/area_types/tmpl/default_body.php b/admin/views/area_types/tmpl/default_body.php index 4e1af41..edd0ab1 100644 --- a/admin/views/area_types/tmpl/default_body.php +++ b/admin/views/area_types/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,16 +75,16 @@ $edit = "index.php?option=com_supportgroups&view=area_types&task=area_type.edit"
diff --git a/admin/views/area_types/tmpl/default_head.php b/admin/views/area_types/tmpl/default_head.php index 06f3cee..741bf39 100644 --- a/admin/views/area_types/tmpl/default_head.php +++ b/admin/views/area_types/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/area_types/tmpl/default_toolbar.php b/admin/views/area_types/tmpl/default_toolbar.php index b908468..8ac8c7f 100644 --- a/admin/views/area_types/tmpl/default_toolbar.php +++ b/admin/views/area_types/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/area_types/view.html.php b/admin/views/area_types/view.html.php index 00c5f6f..2a25d36 100644 --- a/admin/views/area_types/view.html.php +++ b/admin/views/area_types/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Area_types */ @@ -54,6 +51,8 @@ class SupportgroupsViewArea_types extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('area_type'); $this->canEdit = $this->canDo->get('area_type.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewArea_types extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewArea_types extends JViewLegacy { JToolBarHelper::custom('area_types.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('area_type.import')) { @@ -199,7 +198,7 @@ class SupportgroupsViewArea_types extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } } /** diff --git a/admin/views/areas/tmpl/default.php b/admin/views/areas/tmpl/default.php index c54ae0b..d43458d 100644 --- a/admin/views/areas/tmpl/default.php +++ b/admin/views/areas/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/areas/tmpl/default_batch_body.php b/admin/views/areas/tmpl/default_batch_body.php index 092623a..b9cb5df 100644 --- a/admin/views/areas/tmpl/default_batch_body.php +++ b/admin/views/areas/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/areas/tmpl/default_batch_footer.php b/admin/views/areas/tmpl/default_batch_footer.php index c5be103..5c88824 100644 --- a/admin/views/areas/tmpl/default_batch_footer.php +++ b/admin/views/areas/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/areas/tmpl/default_body.php b/admin/views/areas/tmpl/default_body.php index a197873..e2f3867 100644 --- a/admin/views/areas/tmpl/default_body.php +++ b/admin/views/areas/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,34 +75,34 @@ $edit = "index.php?option=com_supportgroups&view=areas&task=area.edit"; diff --git a/admin/views/areas/tmpl/default_head.php b/admin/views/areas/tmpl/default_head.php index b76b112..36429b5 100644 --- a/admin/views/areas/tmpl/default_head.php +++ b/admin/views/areas/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/areas/tmpl/default_toolbar.php b/admin/views/areas/tmpl/default_toolbar.php index 7b9a946..2a919f8 100644 --- a/admin/views/areas/tmpl/default_toolbar.php +++ b/admin/views/areas/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/areas/view.html.php b/admin/views/areas/view.html.php index b888464..cf896d3 100644 --- a/admin/views/areas/view.html.php +++ b/admin/views/areas/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Areas */ @@ -54,6 +51,8 @@ class SupportgroupsViewAreas extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('area'); $this->canEdit = $this->canDo->get('area.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewAreas extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewAreas extends JViewLegacy { JToolBarHelper::custom('areas.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('area.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewAreas extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Area Type Name Selection - $this->area_typeNameOptions = JFormHelper::loadFieldType('Areastype')->getOptions(); + $this->area_typeNameOptions = JFormHelper::loadFieldType('Areastype')->options; if ($this->area_typeNameOptions) { // Area Type Name Filter @@ -224,7 +223,7 @@ class SupportgroupsViewAreas extends JViewLegacy } // Set Region Name Selection - $this->regionNameOptions = JFormHelper::loadFieldType('Regions')->getOptions(); + $this->regionNameOptions = JFormHelper::loadFieldType('Regions')->options; if ($this->regionNameOptions) { // Region Name Filter diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index 246a58f..7555b58 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index fbd7be2..4ffb0b8 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index cb2088f..7c07c8f 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index 798daaf..78409e5 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,25 +75,25 @@ $edit = "index.php?option=com_supportgroups&view=countries&task=country.edit"; diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index 88bd13e..171432a 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index ccebd79..0aeb863 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index c25a18b..bf733b4 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Countries */ @@ -54,6 +51,8 @@ class SupportgroupsViewCountries extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('country'); $this->canEdit = $this->canDo->get('country.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewCountries extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewCountries extends JViewLegacy { JToolBarHelper::custom('countries.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('country.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewCountries extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Currency Name Selection - $this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->getOptions(); + $this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->options; if ($this->currencyNameOptions) { // Currency Name Filter diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index a4674e4..0ec1819 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,7 +31,7 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?> diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index fbfc008..a9a1798 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index 8b2b20a..62800bc 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 9133627..7d486f7 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Currencies */ @@ -54,6 +51,8 @@ class SupportgroupsViewCurrencies extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('currency'); $this->canEdit = $this->canDo->get('currency.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewCurrencies extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewCurrencies extends JViewLegacy { JToolBarHelper::custom('currencies.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('currency.import')) { @@ -199,7 +198,7 @@ class SupportgroupsViewCurrencies extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } } /** diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index 386fcbd..16aca47 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,7 +31,7 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?> diff --git a/admin/views/facilities/tmpl/default_head.php b/admin/views/facilities/tmpl/default_head.php index c0d855d..e5f8635 100644 --- a/admin/views/facilities/tmpl/default_head.php +++ b/admin/views/facilities/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/facilities/tmpl/default_toolbar.php b/admin/views/facilities/tmpl/default_toolbar.php index 3ca951b..6473303 100644 --- a/admin/views/facilities/tmpl/default_toolbar.php +++ b/admin/views/facilities/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/facilities/view.html.php b/admin/views/facilities/view.html.php index 8c6849d..e48a042 100644 --- a/admin/views/facilities/view.html.php +++ b/admin/views/facilities/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Facilities */ @@ -54,6 +51,8 @@ class SupportgroupsViewFacilities extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('facility'); $this->canEdit = $this->canDo->get('facility.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewFacilities extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewFacilities extends JViewLegacy { JToolBarHelper::custom('facilities.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('facility.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewFacilities extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Facility Type Name Selection - $this->facility_typeNameOptions = JFormHelper::loadFieldType('Facilitiestype')->getOptions(); + $this->facility_typeNameOptions = JFormHelper::loadFieldType('Facilitiestype')->options; if ($this->facility_typeNameOptions) { // Facility Type Name Filter diff --git a/admin/views/facility/submitbutton.js b/admin/views/facility/submitbutton.js index 618c1fc..70b343f 100644 --- a/admin/views/facility/submitbutton.js +++ b/admin/views/facility/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -67,6 +67,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups');
+ ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'facilityTab'; ?> + + canDo->get('facility.delete') || $this->canDo->get('facility.edit.created_by') || $this->canDo->get('facility.edit.state') || $this->canDo->get('facility.edit.created')) : ?>
diff --git a/admin/views/facility/view.html.php b/admin/views/facility/view.html.php index 57ef77e..c47ae62 100644 --- a/admin/views/facility/view.html.php +++ b/admin/views/facility/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Facility View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewFacility extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('facility',$this->item); + $this->canDo = SupportgroupsHelper::getActions('facility', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Set the toolbar @@ -92,7 +99,7 @@ class SupportgroupsViewFacility extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_FACILITY_NEW' : 'COM_SUPPORTGROUPS_FACILITY_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('facility.create') && $isNew) { @@ -194,7 +201,7 @@ class SupportgroupsViewFacility extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_FACILITY_NEW' : 'COM_SUPPORTGROUPS_FACILITY_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/facility.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/facility.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addScript(JURI::root() . $this->script, (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); $this->document->addScript(JURI::root() . "administrator/components/com_supportgroups/views/facility/submitbutton.js", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JText::script('view not acceptable. Error'); diff --git a/admin/views/facility_type/submitbutton.js b/admin/views/facility_type/submitbutton.js index 7bc0252..ccf9cd7 100644 --- a/admin/views/facility_type/submitbutton.js +++ b/admin/views/facility_type/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -51,6 +51,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups');
+ ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'facility_typeTab'; ?> + + canDo->get('facility_type.delete') || $this->canDo->get('facility_type.edit.created_by') || $this->canDo->get('facility_type.edit.state') || $this->canDo->get('facility_type.edit.created')) : ?>
diff --git a/admin/views/facility_type/view.html.php b/admin/views/facility_type/view.html.php index fd1b091..a7ae65c 100644 --- a/admin/views/facility_type/view.html.php +++ b/admin/views/facility_type/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Facility_type View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewFacility_type extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('facility_type',$this->item); + $this->canDo = SupportgroupsHelper::getActions('facility_type', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Set the toolbar @@ -92,7 +99,7 @@ class SupportgroupsViewFacility_type extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_FACILITY_TYPE_NEW' : 'COM_SUPPORTGROUPS_FACILITY_TYPE_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('facility_type.create') && $isNew) { @@ -194,7 +201,7 @@ class SupportgroupsViewFacility_type extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_FACILITY_TYPE_NEW' : 'COM_SUPPORTGROUPS_FACILITY_TYPE_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/facility_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/facility_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addScript(JURI::root() . $this->script, (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); $this->document->addScript(JURI::root() . "administrator/components/com_supportgroups/views/facility_type/submitbutton.js", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JText::script('view not acceptable. Error'); diff --git a/admin/views/facility_types/tmpl/default.php b/admin/views/facility_types/tmpl/default.php index d072748..0774e22 100644 --- a/admin/views/facility_types/tmpl/default.php +++ b/admin/views/facility_types/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/facility_types/tmpl/default_batch_body.php b/admin/views/facility_types/tmpl/default_batch_body.php index a26ad06..9432c3a 100644 --- a/admin/views/facility_types/tmpl/default_batch_body.php +++ b/admin/views/facility_types/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/facility_types/tmpl/default_batch_footer.php b/admin/views/facility_types/tmpl/default_batch_footer.php index 7a5004c..1734d74 100644 --- a/admin/views/facility_types/tmpl/default_batch_footer.php +++ b/admin/views/facility_types/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/facility_types/tmpl/default_body.php b/admin/views/facility_types/tmpl/default_body.php index 06de8de..689f4dd 100644 --- a/admin/views/facility_types/tmpl/default_body.php +++ b/admin/views/facility_types/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,16 +75,16 @@ $edit = "index.php?option=com_supportgroups&view=facility_types&task=facility_ty
diff --git a/admin/views/facility_types/tmpl/default_head.php b/admin/views/facility_types/tmpl/default_head.php index 4b223e0..2ee4f44 100644 --- a/admin/views/facility_types/tmpl/default_head.php +++ b/admin/views/facility_types/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/facility_types/tmpl/default_toolbar.php b/admin/views/facility_types/tmpl/default_toolbar.php index 188f98e..c7d7cbc 100644 --- a/admin/views/facility_types/tmpl/default_toolbar.php +++ b/admin/views/facility_types/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/facility_types/view.html.php b/admin/views/facility_types/view.html.php index d2f4585..dc7d73c 100644 --- a/admin/views/facility_types/view.html.php +++ b/admin/views/facility_types/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Facility_types */ @@ -54,6 +51,8 @@ class SupportgroupsViewFacility_types extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('facility_type'); $this->canEdit = $this->canDo->get('facility_type.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewFacility_types extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewFacility_types extends JViewLegacy { JToolBarHelper::custom('facility_types.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('facility_type.import')) { @@ -199,7 +198,7 @@ class SupportgroupsViewFacility_types extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } } /** diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 99d191b..50719e8 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,7 +31,7 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?> diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 634131f..721fd34 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index ee03295..6e01b96 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 5a07e2f..a114933 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Help_documents */ @@ -54,6 +51,8 @@ class SupportgroupsViewHelp_documents extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('help_document'); $this->canEdit = $this->canDo->get('help_document.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewHelp_documents extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewHelp_documents extends JViewLegacy { JToolBarHelper::custom('help_documents.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('help_document.import')) { @@ -199,7 +198,7 @@ class SupportgroupsViewHelp_documents extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Type Selection $this->typeOptions = $this->getTheTypeSelections(); @@ -246,7 +245,7 @@ class SupportgroupsViewHelp_documents extends JViewLegacy } // Set Admin View Selection - $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->getOptions(); + $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options; if ($this->admin_viewOptions) { // Admin View Filter @@ -268,7 +267,7 @@ class SupportgroupsViewHelp_documents extends JViewLegacy } // Set Site View Selection - $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->getOptions(); + $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options; if ($this->site_viewOptions) { // Site View Filter diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index c32581f..c1e2f25 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index d4756be..04128ef 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups Import View */ diff --git a/admin/views/info_type/submitbutton.js b/admin/views/info_type/submitbutton.js index 46ea8af..7b1577b 100644 --- a/admin/views/info_type/submitbutton.js +++ b/admin/views/info_type/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -51,6 +51,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups');
+ ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'info_typeTab'; ?> + + canDo->get('info_type.delete') || $this->canDo->get('info_type.edit.created_by') || $this->canDo->get('info_type.edit.state') || $this->canDo->get('info_type.edit.created')) : ?>
diff --git a/admin/views/info_type/view.html.php b/admin/views/info_type/view.html.php index d1ed752..0884a34 100644 --- a/admin/views/info_type/view.html.php +++ b/admin/views/info_type/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Info_type View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewInfo_type extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('info_type',$this->item); + $this->canDo = SupportgroupsHelper::getActions('info_type', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Set the toolbar @@ -92,7 +99,7 @@ class SupportgroupsViewInfo_type extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_INFO_TYPE_NEW' : 'COM_SUPPORTGROUPS_INFO_TYPE_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('info_type.create') && $isNew) { @@ -194,7 +201,7 @@ class SupportgroupsViewInfo_type extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_INFO_TYPE_NEW' : 'COM_SUPPORTGROUPS_INFO_TYPE_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/info_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/info_type.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addScript(JURI::root() . $this->script, (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); $this->document->addScript(JURI::root() . "administrator/components/com_supportgroups/views/info_type/submitbutton.js", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JText::script('view not acceptable. Error'); diff --git a/admin/views/info_types/tmpl/default.php b/admin/views/info_types/tmpl/default.php index cd9daf7..acc6481 100644 --- a/admin/views/info_types/tmpl/default.php +++ b/admin/views/info_types/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/info_types/tmpl/default_batch_body.php b/admin/views/info_types/tmpl/default_batch_body.php index 81f81e6..5874aaf 100644 --- a/admin/views/info_types/tmpl/default_batch_body.php +++ b/admin/views/info_types/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/info_types/tmpl/default_batch_footer.php b/admin/views/info_types/tmpl/default_batch_footer.php index 082385a..d0edcb6 100644 --- a/admin/views/info_types/tmpl/default_batch_footer.php +++ b/admin/views/info_types/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/info_types/tmpl/default_body.php b/admin/views/info_types/tmpl/default_body.php index 1270939..54a0c85 100644 --- a/admin/views/info_types/tmpl/default_body.php +++ b/admin/views/info_types/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,16 +75,16 @@ $edit = "index.php?option=com_supportgroups&view=info_types&task=info_type.edit"
diff --git a/admin/views/info_types/tmpl/default_head.php b/admin/views/info_types/tmpl/default_head.php index 82fffa2..77cb7fe 100644 --- a/admin/views/info_types/tmpl/default_head.php +++ b/admin/views/info_types/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/info_types/tmpl/default_toolbar.php b/admin/views/info_types/tmpl/default_toolbar.php index 80d5b9e..9844a8d 100644 --- a/admin/views/info_types/tmpl/default_toolbar.php +++ b/admin/views/info_types/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/info_types/view.html.php b/admin/views/info_types/view.html.php index f5c948f..7ade3ff 100644 --- a/admin/views/info_types/view.html.php +++ b/admin/views/info_types/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Info_types */ @@ -54,6 +51,8 @@ class SupportgroupsViewInfo_types extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('info_type'); $this->canEdit = $this->canDo->get('info_type.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewInfo_types extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewInfo_types extends JViewLegacy { JToolBarHelper::custom('info_types.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('info_type.import')) { @@ -199,7 +198,7 @@ class SupportgroupsViewInfo_types extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } } /** diff --git a/admin/views/payment/submitbutton.js b/admin/views/payment/submitbutton.js index ebb3ea1..e7657da 100644 --- a/admin/views/payment/submitbutton.js +++ b/admin/views/payment/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,10 +31,10 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?>
- +
@@ -52,6 +52,10 @@ $componentParams = JComponentHelper::getParams('com_supportgroups');
+ ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?> + tab_name = 'paymentTab'; ?> + + canDo->get('payment.delete') || $this->canDo->get('payment.edit.created_by') || $this->canDo->get('payment.edit.state') || $this->canDo->get('payment.edit.created')) : ?>
diff --git a/admin/views/payment/view.html.php b/admin/views/payment/view.html.php index 8e34dcc..0ea5fe4 100644 --- a/admin/views/payment/view.html.php +++ b/admin/views/payment/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Payment View class */ @@ -40,27 +37,37 @@ class SupportgroupsViewPayment extends JViewLegacy */ public function display($tpl = null) { + // set params + $this->params = JComponentHelper::getParams('com_supportgroups'); // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); // get action permissions - $this->canDo = SupportgroupsHelper::getActions('payment',$this->item); + $this->canDo = SupportgroupsHelper::getActions('payment', $this->item); // get input $jinput = JFactory::getApplication()->input; $this->ref = $jinput->get('ref', 0, 'word'); $this->refid = $jinput->get('refid', 0, 'int'); + $return = $jinput->get('return', null, 'base64'); + // set the referral string $this->referral = ''; - if ($this->refid) + if ($this->refid && $this->ref) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that referred to this item + $this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that referred to this item + $this->referral = '&ref=' . (string)$this->ref; + } + // check return value + if (!is_null($return)) + { + // add the return value + $this->referral .= '&return=' . (string)$return; } // Set the toolbar @@ -92,7 +99,7 @@ class SupportgroupsViewPayment extends JViewLegacy JToolbarHelper::title( JText::_($isNew ? 'COM_SUPPORTGROUPS_PAYMENT_NEW' : 'COM_SUPPORTGROUPS_PAYMENT_EDIT'), 'pencil-2 article-add'); // Built the actions for new and existing records. - if ($this->refid || $this->ref) + if (SupportgroupsHelper::checkString($this->referral)) { if ($this->canDo->get('payment.create') && $isNew) { @@ -194,7 +201,7 @@ class SupportgroupsViewPayment extends JViewLegacy $this->document = JFactory::getDocument(); } $this->document->setTitle(JText::_($isNew ? 'COM_SUPPORTGROUPS_PAYMENT_NEW' : 'COM_SUPPORTGROUPS_PAYMENT_EDIT')); - $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/payment.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + $this->document->addStyleSheet(JURI::root() . "administrator/components/com_supportgroups/assets/css/payment.css", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addScript(JURI::root() . $this->script, (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); $this->document->addScript(JURI::root() . "administrator/components/com_supportgroups/views/payment/submitbutton.js", (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JText::script('view not acceptable. Error'); diff --git a/admin/views/payments/tmpl/default.php b/admin/views/payments/tmpl/default.php index 9065267..910f739 100644 --- a/admin/views/payments/tmpl/default.php +++ b/admin/views/payments/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/payments/tmpl/default_batch_body.php b/admin/views/payments/tmpl/default_batch_body.php index 76ac51f..b6a80c4 100644 --- a/admin/views/payments/tmpl/default_batch_body.php +++ b/admin/views/payments/tmpl/default_batch_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/payments/tmpl/default_batch_footer.php b/admin/views/payments/tmpl/default_batch_footer.php index 47143dd..d2541ae 100644 --- a/admin/views/payments/tmpl/default_batch_footer.php +++ b/admin/views/payments/tmpl/default_batch_footer.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/payments/tmpl/default_body.php b/admin/views/payments/tmpl/default_body.php index ebd2d4b..5267c6c 100644 --- a/admin/views/payments/tmpl/default_body.php +++ b/admin/views/payments/tmpl/default_body.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_body.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -75,16 +75,16 @@ $edit = "index.php?option=com_supportgroups&view=payments&task=payment.edit";
diff --git a/admin/views/payments/tmpl/default_head.php b/admin/views/payments/tmpl/default_head.php index 8cf9ff2..0f52b13 100644 --- a/admin/views/payments/tmpl/default_head.php +++ b/admin/views/payments/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/payments/tmpl/default_toolbar.php b/admin/views/payments/tmpl/default_toolbar.php index 34ae15a..099f916 100644 --- a/admin/views/payments/tmpl/default_toolbar.php +++ b/admin/views/payments/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/payments/view.html.php b/admin/views/payments/view.html.php index 07e8587..6fd5103 100644 --- a/admin/views/payments/view.html.php +++ b/admin/views/payments/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Payments */ @@ -54,6 +51,8 @@ class SupportgroupsViewPayments extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('payment'); $this->canEdit = $this->canDo->get('payment.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewPayments extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewPayments extends JViewLegacy { JToolBarHelper::custom('payments.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('payment.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewPayments extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Support Group Name Selection - $this->support_groupNameOptions = JFormHelper::loadFieldType('Supportgroups')->getOptions(); + $this->support_groupNameOptions = JFormHelper::loadFieldType('Supportgroups')->options; if ($this->support_groupNameOptions) { // Support Group Name Filter diff --git a/admin/views/region/submitbutton.js b/admin/views/region/submitbutton.js index 6d0512e..194ee77 100644 --- a/admin/views/region/submitbutton.js +++ b/admin/views/region/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,7 +31,7 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?> diff --git a/admin/views/regions/tmpl/default_head.php b/admin/views/regions/tmpl/default_head.php index 676a8fd..869c8e0 100644 --- a/admin/views/regions/tmpl/default_head.php +++ b/admin/views/regions/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/regions/tmpl/default_toolbar.php b/admin/views/regions/tmpl/default_toolbar.php index 33df26f..1b2c0cb 100644 --- a/admin/views/regions/tmpl/default_toolbar.php +++ b/admin/views/regions/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/regions/view.html.php b/admin/views/regions/view.html.php index baf2e4a..5b3b031 100644 --- a/admin/views/regions/view.html.php +++ b/admin/views/regions/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Regions */ @@ -54,6 +51,8 @@ class SupportgroupsViewRegions extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('region'); $this->canEdit = $this->canDo->get('region.edit'); @@ -133,7 +132,7 @@ class SupportgroupsViewRegions extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) { @@ -148,7 +147,7 @@ class SupportgroupsViewRegions extends JViewLegacy { JToolBarHelper::custom('regions.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('region.import')) { @@ -199,10 +198,10 @@ class SupportgroupsViewRegions extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Country Name Selection - $this->countryNameOptions = JFormHelper::loadFieldType('Countries')->getOptions(); + $this->countryNameOptions = JFormHelper::loadFieldType('Countries')->options; if ($this->countryNameOptions) { // Country Name Filter diff --git a/admin/views/support_group/submitbutton.js b/admin/views/support_group/submitbutton.js index 1555d7f..d545a36 100644 --- a/admin/views/support_group/submitbutton.js +++ b/admin/views/support_group/submitbutton.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ Joomla.submitbutton = function(task) @@ -27,19 +27,9 @@ Joomla.submitbutton = function(task) if (task == ''){ return false; } else { - var isValid=true; var action = task.split('.'); - if (action[1] != 'cancel' && action[1] != 'close'){ - var forms = $$('form.form-validate'); - for (var i=0;i + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -31,7 +31,7 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -$componentParams = JComponentHelper::getParams('com_supportgroups'); +$componentParams = $this->params; // will be removed just use $this->params instead ?> diff --git a/admin/views/support_groups/tmpl/default_head.php b/admin/views/support_groups/tmpl/default_head.php index 0d9e4a0..0c7441d 100644 --- a/admin/views/support_groups/tmpl/default_head.php +++ b/admin/views/support_groups/tmpl/default_head.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_head.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> diff --git a/admin/views/support_groups/tmpl/default_toolbar.php b/admin/views/support_groups/tmpl/default_toolbar.php index c97c2a0..49bdebe 100644 --- a/admin/views/support_groups/tmpl/default_toolbar.php +++ b/admin/views/support_groups/tmpl/default_toolbar.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/support_groups/view.html.php b/admin/views/support_groups/view.html.php index c0e7e65..1cc2da2 100644 --- a/admin/views/support_groups/view.html.php +++ b/admin/views/support_groups/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class for the Support_groups */ @@ -54,6 +51,8 @@ class SupportgroupsViewSupport_groups extends JViewLegacy $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); $this->saveOrder = $this->listOrder == 'ordering'; + // set the return here value + $this->return_here = urlencode(base64_encode((string) JUri::getInstance())); // get global action permissions $this->canDo = SupportgroupsHelper::getActions('support_group'); $this->canEdit = $this->canDo->get('support_group.edit'); @@ -133,11 +132,11 @@ class SupportgroupsViewSupport_groups extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } + } if ($this->user->authorise('support_group.smart_export', 'com_supportgroups')) { // add Smart Export button. - JToolBarHelper::custom('support_groups.smartExport', 'download', '', 'COM_SUPPORTGROUPS_SMART_EXPORT', false); + JToolBarHelper::custom('support_groups.smartExport', 'download', '', 'COM_SUPPORTGROUPS_SMART_EXPORT', 'true'); } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) @@ -153,7 +152,7 @@ class SupportgroupsViewSupport_groups extends JViewLegacy { JToolBarHelper::custom('support_groups.exportData', 'download', '', 'COM_SUPPORTGROUPS_EXPORT_DATA', true); } - } + } if ($this->canDo->get('core.import') && $this->canDo->get('support_group.import')) { @@ -204,10 +203,10 @@ class SupportgroupsViewSupport_groups extends JViewLegacy 'batch[access]', JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text') ); - } + } // Set Area Name Selection - $this->areaNameOptions = JFormHelper::loadFieldType('Areas')->getOptions(); + $this->areaNameOptions = JFormHelper::loadFieldType('Areas')->options; if ($this->areaNameOptions) { // Area Name Filter @@ -229,7 +228,7 @@ class SupportgroupsViewSupport_groups extends JViewLegacy } // Set Facility Name Selection - $this->facilityNameOptions = JFormHelper::loadFieldType('Facilities')->getOptions(); + $this->facilityNameOptions = JFormHelper::loadFieldType('Facilities')->options; if ($this->facilityNameOptions) { // Facility Name Filter diff --git a/admin/views/supportgroups/tmpl/default.php b/admin/views/supportgroups/tmpl/default.php index e19d857..523c305 100644 --- a/admin/views/supportgroups/tmpl/default.php +++ b/admin/views/supportgroups/tmpl/default.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/supportgroups/tmpl/default_main.php b/admin/views/supportgroups/tmpl/default_main.php index 73c4e8e..78658de 100644 --- a/admin/views/supportgroups/tmpl/default_main.php +++ b/admin/views/supportgroups/tmpl/default_main.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default_main.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/supportgroups/tmpl/default_readme_information.php b/admin/views/supportgroups/tmpl/default_readme_information.php index 5be2d00..b797471 100644 --- a/admin/views/supportgroups/tmpl/default_readme_information.php +++ b/admin/views/supportgroups/tmpl/default_readme_information.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default_readme_information.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> readme; ?> diff --git a/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php b/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php index fca574a..36f5b5e 100644 --- a/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default_vast_development_method_notice_board.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?> noticeboard; ?> diff --git a/admin/views/supportgroups/tmpl/default_vdm.php b/admin/views/supportgroups/tmpl/default_vdm.php index 4c532ac..cbf8865 100644 --- a/admin/views/supportgroups/tmpl/default_vdm.php +++ b/admin/views/supportgroups/tmpl/default_vdm.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage default_vdm.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/admin/views/supportgroups/view.html.php b/admin/views/supportgroups/view.html.php index deb7d5a..84e437d 100644 --- a/admin/views/supportgroups/view.html.php +++ b/admin/views/supportgroups/view.html.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla view library -jimport('joomla.application.component.view'); - /** * Supportgroups View class */ diff --git a/script.php b/script.php index 5dc230a..77fabe2 100644 --- a/script.php +++ b/script.php @@ -6,29 +6,27 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage script.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); JHTML::_('behavior.modal'); -jimport('joomla.installer.installer'); -jimport('joomla.installer.helper'); /** * Script File of Supportgroups Component @@ -83,7 +81,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Support_group items $support_group_done = $db->execute(); - if ($support_group_done); + if ($support_group_done) { // If succesfully remove Support_group add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.support_group) type alias was removed from the #__content_type table')); @@ -98,7 +96,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Support_group items $support_group_done = $db->execute(); - if ($support_group_done); + if ($support_group_done) { // If succesfully remove Support_group add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.support_group) type alias was removed from the #__contentitem_tag_map table')); @@ -113,7 +111,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Support_group items $support_group_done = $db->execute(); - if ($support_group_done); + if ($support_group_done) { // If succesfully remove Support_group add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.support_group) type alias was removed from the #__ucm_content table')); @@ -169,7 +167,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Payment items $payment_done = $db->execute(); - if ($payment_done); + if ($payment_done) { // If succesfully remove Payment add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.payment) type alias was removed from the #__content_type table')); @@ -184,7 +182,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Payment items $payment_done = $db->execute(); - if ($payment_done); + if ($payment_done) { // If succesfully remove Payment add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.payment) type alias was removed from the #__contentitem_tag_map table')); @@ -199,7 +197,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Payment items $payment_done = $db->execute(); - if ($payment_done); + if ($payment_done) { // If succesfully remove Payment add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.payment) type alias was removed from the #__ucm_content table')); @@ -255,7 +253,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility items $facility_done = $db->execute(); - if ($facility_done); + if ($facility_done) { // If succesfully remove Facility add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility) type alias was removed from the #__content_type table')); @@ -270,7 +268,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility items $facility_done = $db->execute(); - if ($facility_done); + if ($facility_done) { // If succesfully remove Facility add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility) type alias was removed from the #__contentitem_tag_map table')); @@ -285,7 +283,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility items $facility_done = $db->execute(); - if ($facility_done); + if ($facility_done) { // If succesfully remove Facility add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility) type alias was removed from the #__ucm_content table')); @@ -341,7 +339,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility_type items $facility_type_done = $db->execute(); - if ($facility_type_done); + if ($facility_type_done) { // If succesfully remove Facility_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility_type) type alias was removed from the #__content_type table')); @@ -356,7 +354,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility_type items $facility_type_done = $db->execute(); - if ($facility_type_done); + if ($facility_type_done) { // If succesfully remove Facility_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility_type) type alias was removed from the #__contentitem_tag_map table')); @@ -371,7 +369,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Facility_type items $facility_type_done = $db->execute(); - if ($facility_type_done); + if ($facility_type_done) { // If succesfully remove Facility_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.facility_type) type alias was removed from the #__ucm_content table')); @@ -427,7 +425,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Additional_info items $additional_info_done = $db->execute(); - if ($additional_info_done); + if ($additional_info_done) { // If succesfully remove Additional_info add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.additional_info) type alias was removed from the #__content_type table')); @@ -442,7 +440,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Additional_info items $additional_info_done = $db->execute(); - if ($additional_info_done); + if ($additional_info_done) { // If succesfully remove Additional_info add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.additional_info) type alias was removed from the #__contentitem_tag_map table')); @@ -457,7 +455,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Additional_info items $additional_info_done = $db->execute(); - if ($additional_info_done); + if ($additional_info_done) { // If succesfully remove Additional_info add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.additional_info) type alias was removed from the #__ucm_content table')); @@ -513,7 +511,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Info_type items $info_type_done = $db->execute(); - if ($info_type_done); + if ($info_type_done) { // If succesfully remove Info_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.info_type) type alias was removed from the #__content_type table')); @@ -528,7 +526,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Info_type items $info_type_done = $db->execute(); - if ($info_type_done); + if ($info_type_done) { // If succesfully remove Info_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.info_type) type alias was removed from the #__contentitem_tag_map table')); @@ -543,7 +541,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Info_type items $info_type_done = $db->execute(); - if ($info_type_done); + if ($info_type_done) { // If succesfully remove Info_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.info_type) type alias was removed from the #__ucm_content table')); @@ -599,7 +597,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area items $area_done = $db->execute(); - if ($area_done); + if ($area_done) { // If succesfully remove Area add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area) type alias was removed from the #__content_type table')); @@ -614,7 +612,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area items $area_done = $db->execute(); - if ($area_done); + if ($area_done) { // If succesfully remove Area add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area) type alias was removed from the #__contentitem_tag_map table')); @@ -629,7 +627,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area items $area_done = $db->execute(); - if ($area_done); + if ($area_done) { // If succesfully remove Area add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area) type alias was removed from the #__ucm_content table')); @@ -685,7 +683,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area_type items $area_type_done = $db->execute(); - if ($area_type_done); + if ($area_type_done) { // If succesfully remove Area_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area_type) type alias was removed from the #__content_type table')); @@ -700,7 +698,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area_type items $area_type_done = $db->execute(); - if ($area_type_done); + if ($area_type_done) { // If succesfully remove Area_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area_type) type alias was removed from the #__contentitem_tag_map table')); @@ -715,7 +713,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Area_type items $area_type_done = $db->execute(); - if ($area_type_done); + if ($area_type_done) { // If succesfully remove Area_type add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.area_type) type alias was removed from the #__ucm_content table')); @@ -771,7 +769,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Region items $region_done = $db->execute(); - if ($region_done); + if ($region_done) { // If succesfully remove Region add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.region) type alias was removed from the #__content_type table')); @@ -786,7 +784,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Region items $region_done = $db->execute(); - if ($region_done); + if ($region_done) { // If succesfully remove Region add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.region) type alias was removed from the #__contentitem_tag_map table')); @@ -801,7 +799,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Region items $region_done = $db->execute(); - if ($region_done); + if ($region_done) { // If succesfully remove Region add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.region) type alias was removed from the #__ucm_content table')); @@ -857,7 +855,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Country items $country_done = $db->execute(); - if ($country_done); + if ($country_done) { // If succesfully remove Country add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.country) type alias was removed from the #__content_type table')); @@ -872,7 +870,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Country items $country_done = $db->execute(); - if ($country_done); + if ($country_done) { // If succesfully remove Country add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.country) type alias was removed from the #__contentitem_tag_map table')); @@ -887,7 +885,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Country items $country_done = $db->execute(); - if ($country_done); + if ($country_done) { // If succesfully remove Country add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.country) type alias was removed from the #__ucm_content table')); @@ -943,7 +941,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Currency items $currency_done = $db->execute(); - if ($currency_done); + if ($currency_done) { // If succesfully remove Currency add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.currency) type alias was removed from the #__content_type table')); @@ -958,7 +956,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Currency items $currency_done = $db->execute(); - if ($currency_done); + if ($currency_done) { // If succesfully remove Currency add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.currency) type alias was removed from the #__contentitem_tag_map table')); @@ -973,7 +971,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Currency items $currency_done = $db->execute(); - if ($currency_done); + if ($currency_done) { // If succesfully remove Currency add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.currency) type alias was removed from the #__ucm_content table')); @@ -1029,7 +1027,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Help_document items $help_document_done = $db->execute(); - if ($help_document_done); + if ($help_document_done) { // If succesfully remove Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.help_document) type alias was removed from the #__content_type table')); @@ -1044,7 +1042,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Help_document items $help_document_done = $db->execute(); - if ($help_document_done); + if ($help_document_done) { // If succesfully remove Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.help_document) type alias was removed from the #__contentitem_tag_map table')); @@ -1059,7 +1057,7 @@ class com_supportgroupsInstallerScript $db->setQuery($query); // Execute the query to remove Help_document items $help_document_done = $db->execute(); - if ($help_document_done); + if ($help_document_done) { // If succesfully remove Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_supportgroups.help_document) type alias was removed from the #__ucm_content table')); @@ -1103,7 +1101,7 @@ class com_supportgroupsInstallerScript $query->where($supportgroups_condition); $db->setQuery($query); $help_document_done = $db->execute(); - if ($help_document_done); + if ($help_document_done) { // If succesfully remove supportgroups add queued success message. $app->enqueueMessage(JText::_('All related items was removed from the #__assets table')); @@ -1696,7 +1694,7 @@ class com_supportgroupsInstallerScript echo ' -

Upgrade to Version 1.0.8 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 1.0.10 Was Successful! Let us know if anything is not working as expected.

'; } } } diff --git a/site/assets/css/map.css b/site/assets/css/map.css index 0c0e815..173205c 100644 --- a/site/assets/css/map.css +++ b/site/assets/css/map.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 366 of this MVC - @build 5th July, 2016 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage map.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/site/assets/css/site.css b/site/assets/css/site.css index bc9e4a5..785f92a 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage site.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/site/assets/css/supportgroups.css b/site/assets/css/supportgroups.css index cc7ed75..4f0c736 100644 --- a/site/assets/css/supportgroups.css +++ b/site/assets/css/supportgroups.css @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 390 of this MVC - @build 1st April, 2017 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage supportgroups.css - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* CSS Document */ diff --git a/site/assets/js/site.js b/site/assets/js/site.js index a2bb2d1..f84d203 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage site.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ /* JS Document */ diff --git a/site/controller.php b/site/controller.php index eca2fca..4f587bb 100644 --- a/site/controller.php +++ b/site/controller.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage controller.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controller library -jimport('joomla.application.component.controller'); - /** * Supportgroups Component Controller */ diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 60b935b..92ec888 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage ajax.json.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controller'); - /** * Supportgroups Ajax Controller */ diff --git a/site/controllers/help.php b/site/controllers/help.php index 74c2339..1fcdb5f 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage help.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import Joomla controllerform library -jimport('joomla.application.component.controller'); - /** * Supportgroups Help Controller */ diff --git a/site/helpers/category.php b/site/helpers/category.php index 3795c59..6dcb86a 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage category.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 10d23dd..5e4b079 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage headercheck.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/site/helpers/route.php b/site/helpers/route.php index e12219b..3e060e0 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -6,30 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage route.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// Component Helper -jimport('joomla.application.component.helper'); -jimport('joomla.application.categories'); - /** * Supportgroups Route Helper **/ @@ -38,8 +34,8 @@ abstract class SupportgroupsHelperRoute protected static $lookup; /** - * @param int The route of the Map - */ + * @param int The route of the Map + */ public static function getMapRoute($id = 0, $catid = 0) { if ($id > 0) @@ -54,8 +50,10 @@ abstract class SupportgroupsHelperRoute else { // Initialize the needel array. - $needles = array(); - //Create the link but don't add the id. + $needles = array( + 'map' => array() + ); + // Create the link but don't add the id. $link = 'index.php?option=com_supportgroups&view=map'; } if ($catid > 1) @@ -79,8 +77,8 @@ abstract class SupportgroupsHelperRoute } /** - * @param int The route of the Supportgroups - */ + * @param int The route of the Supportgroups + */ public static function getSupportgroupsRoute($id = 0, $catid = 0) { if ($id > 0) @@ -95,8 +93,10 @@ abstract class SupportgroupsHelperRoute else { // Initialize the needel array. - $needles = array(); - //Create the link but don't add the id. + $needles = array( + 'supportgroups' => array() + ); + // Create the link but don't add the id. $link = 'index.php?option=com_supportgroups&view=supportgroups'; } if ($catid > 1) @@ -203,8 +203,8 @@ abstract class SupportgroupsHelperRoute } } return $link; - } - + } + protected static function _findItem($needles = null,$type = null) { $app = JFactory::getApplication(); @@ -252,6 +252,10 @@ abstract class SupportgroupsHelperRoute self::$lookup[$language][$view][$item->query['id']] = $item->id; } } + else + { + self::$lookup[$language][$view][0] = $item->id; + } } } } @@ -262,17 +266,24 @@ abstract class SupportgroupsHelperRoute { if (isset(self::$lookup[$language][$view])) { - foreach ($ids as $id) + if (SupportgroupsHelper::checkArray($ids)) { - if (isset(self::$lookup[$language][$view][(int) $id])) + foreach ($ids as $id) { - return self::$lookup[$language][$view][(int) $id]; + if (isset(self::$lookup[$language][$view][(int) $id])) + { + return self::$lookup[$language][$view][(int) $id]; + } } } + elseif (isset(self::$lookup[$language][$view][0])) + { + return self::$lookup[$language][$view][0]; + } } } } - + if ($type) { // Check if the global menu item has been set. diff --git a/site/helpers/supportgroups.php b/site/helpers/supportgroups.php index 7111e5c..0e66581 100644 --- a/site/helpers/supportgroups.php +++ b/site/helpers/supportgroups.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); * Supportgroups component helper */ abstract class SupportgroupsHelper -{ +{ public static function setTotals(&$data,&$type,&$id) { @@ -144,7 +144,7 @@ abstract class SupportgroupsHelper } } return false; - } + } public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name') { @@ -169,16 +169,16 @@ abstract class SupportgroupsHelper { if ($external) { - if ($name = self::getVar(null, $val, $id, $name, '=', $table)) + if ($_name = self::getVar(null, $val, $id, $name, '=', $table)) { - $names[] = $name; + $names[] = $_name; } } else { - if ($name = self::getVar($table, $val, $id, $name)) + if ($_name = self::getVar($table, $val, $id, $name)) { - $names[] = $name; + $names[] = $_name; } } } @@ -195,7 +195,7 @@ abstract class SupportgroupsHelper } /** - * Load the Component xml manifest. + * Load the Component xml manifest. **/ public static function manifest() { @@ -204,12 +204,12 @@ abstract class SupportgroupsHelper } /** - * Joomla version object + * Joomla version object **/ protected static $JVersion; /** - * set/get Joomla version + * set/get Joomla version **/ public static function jVersion() { @@ -222,7 +222,7 @@ abstract class SupportgroupsHelper } /** - * Load the Contributors details. + * Load the Contributors details. **/ public static function getContributors() { @@ -260,8 +260,8 @@ abstract class SupportgroupsHelper } /** - * Load the Component Help URLs. - **/ + * Load the Component Help URLs. + **/ public static function getHelpUrl($view) { $user = JFactory::getUser(); @@ -298,15 +298,15 @@ abstract class SupportgroupsHelper // set joomla article case 1: return self::loadArticleLink($help->article); - break; + break; // set help text case 2: return self::loadHelpTextLink($help->id); - break; + break; // set Link case 3: return $help->url; - break; + break; } } } @@ -315,16 +315,16 @@ abstract class SupportgroupsHelper } /** - * Get the Article Link. - **/ + * Get the Article Link. + **/ protected static function loadArticleLink($id) { return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal'; } /** - * Get the Help Text Link. - **/ + * Get the Help Text Link. + **/ protected static function loadHelpTextLink($id) { $token = JSession::getFormToken(); @@ -332,7 +332,7 @@ abstract class SupportgroupsHelper } /** - * Get any component's model + * Get any component's model **/ public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = 'Supportgroups', $config = array()) { @@ -376,9 +376,9 @@ abstract class SupportgroupsHelper } /** - * Add to asset Table + * Add to asset Table */ - public static function setAsset($id,$table) + public static function setAsset($id, $table, $inherit = true) { $parent = JTable::getInstance('Asset'); $parent->loadByName('com_supportgroups'); @@ -395,8 +395,6 @@ abstract class SupportgroupsHelper if ($error) { - $this->setError($error); - return false; } else @@ -412,7 +410,7 @@ abstract class SupportgroupsHelper $asset->name = $name; $asset->title = $title; // get the default asset rules - $rules = self::getDefaultAssetRules('com_supportgroups',$table); + $rules = self::getDefaultAssetRules('com_supportgroups', $table, $inherit); if ($rules instanceof JAccessRules) { $asset->rules = (string) $rules; @@ -440,55 +438,62 @@ abstract class SupportgroupsHelper } /** - * Gets the default asset Rules for a component/view. + * Gets the default asset Rules for a component/view. */ - protected static function getDefaultAssetRules($component,$view) + protected static function getDefaultAssetRules($component, $view, $inherit = true) { - // Need to find the asset id by the name of the component. - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__assets')) - ->where($db->quoteName('name') . ' = ' . $db->quote($component)); - $db->setQuery($query); - $db->execute(); - if ($db->loadRowList()) + // if new or inherited + $assetId = 0; + // Only get the actual item rules if not inheriting + if (!$inherit) { - // asset alread set so use saved rules - $assetId = (int) $db->loadResult(); - $result = JAccess::getAssetRules($assetId); - if ($result instanceof JAccessRules) + // Need to find the asset id by the name of the component. + $db = JFactory::getDbo(); + $query = $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__assets')) + ->where($db->quoteName('name') . ' = ' . $db->quote($component)); + $db->setQuery($query); + $db->execute(); + // check that there is a value + if ($db->getNumRows()) { - $_result = (string) $result; - $_result = json_decode($_result); - foreach ($_result as $name => &$rule) - { - $v = explode('.', $name); - if ($view !== $v[0]) - { - // remove since it is not part of this view - unset($_result->$name); - } - else - { - // clear the value since we inherit - $rule = array(); - } - } - // check if there are any view values remaining - if (count($_result)) - { - $_result = json_encode($_result); - $_result = array($_result); - // Instantiate and return the JAccessRules object for the asset rules. - $rules = new JAccessRules($_result); - - return $rules; - } - return $result; + // asset already set so use saved rules + $assetId = (int) $db->loadResult(); } } - return JAccess::getAssetRules(0); + // get asset rules + $result = JAccess::getAssetRules($assetId); + if ($result instanceof JAccessRules) + { + $_result = (string) $result; + $_result = json_decode($_result); + foreach ($_result as $name => &$rule) + { + $v = explode('.', $name); + if ($view !== $v[0]) + { + // remove since it is not part of this view + unset($_result->$name); + } + elseif ($inherit) + { + // clear the value since we inherit + $rule = array(); + } + } + // check if there are any view values remaining + if (count($_result)) + { + $_result = json_encode($_result); + $_result = array($_result); + // Instantiate and return the JAccessRules object for the asset rules. + $rules = new JAccessRules($_result); + // return filtered rules + return $rules; + } + } + return $result; } /** @@ -582,10 +587,50 @@ abstract class SupportgroupsHelper } } + /** + * get the field object + * + * @param array $attributes The array of attributes + * @param string $default The default of the field + * @param array $options The options to apply to the XML element + * + * @return object + * + */ + public static function getFieldObject($attributes, $default = '', $options = null) + { + // make sure we have attributes and a type value + if (self::checkArray($attributes) && isset($attributes['type'])) + { + // make sure the form helper class is loaded + if (!method_exists('JFormHelper', 'loadFieldType')) + { + jimport('joomla.form.form'); + } + // get field type + $field = JFormHelper::loadFieldType($attributes['type'],true); + // start field xml + $XML = new SimpleXMLElement(''); + // load the attributes + self::xmlAddAttributes($XML, $attributes); + // check if we have options + if (self::checkArray($options)) + { + // load the options + self::xmlAddOptions($XML, $options); + } + // setup the field + $field->setup($XML, $default); + // return the field object + return $field; + } + return false; + } + /** * Render Bool Button * - * @param array $args All the args for the button + * @param array $args All the args for the button * 0) name * 1) additional (options class) // not used at this time * 2) default @@ -600,8 +645,6 @@ abstract class SupportgroupsHelper $args = func_get_args(); // check if there is additional button class $additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time - // start the xml - $buttonXML = new SimpleXMLElement(''); // button attributes $buttonAttributes = array( 'type' => 'radio', @@ -610,27 +653,17 @@ abstract class SupportgroupsHelper 'class' => 'btn-group', 'filter' => 'INT', 'default' => isset($args[2]) ? (int) $args[2] : 0); - // load the haskey attributes - self::xmlAddAttributes($buttonXML, $buttonAttributes); // set the button options $buttonOptions = array( '1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES', '0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO'); - // load the button options - self::xmlAddOptions($buttonXML, $buttonOptions); - - // get the radio element - $button = JFormHelper::loadFieldType('radio'); - - // run - $button->setup($buttonXML, $buttonAttributes['default']); - - return $button->input; + // return the input + return self::getFieldObject($buttonAttributes, $buttonAttributes['default'], $buttonOptions)->input; } /** - * UIKIT Component Classes - **/ + * UIKIT Component Classes + **/ public static $uk_components = array( 'data-uk-grid' => array( 'grid' ), @@ -684,15 +717,15 @@ abstract class SupportgroupsHelper 'upload-drop' => array( 'upload', 'form-file' ) ); - + /** - * Add UIKIT Components - **/ + * Add UIKIT Components + **/ public static $uikit = false; /** - * Get UIKIT Components - **/ + * Get UIKIT Components + **/ public static function getUikitComp($content,$classes = array()) { if (strpos($content,'class="uk-') !== false) @@ -722,13 +755,13 @@ abstract class SupportgroupsHelper } return $temp; } - } + } if (self::checkArray($classes)) { return $classes; } return false; - } + } /** * Get a variable @@ -885,183 +918,149 @@ abstract class SupportgroupsHelper } /** - * Get the actions permissions + * Get the action permissions + * + * @param string $view The related view name + * @param int $record The item to act upon + * @param string $views The related list view name + * @param mixed $target Only get this permission (like edit, create, delete) + * @param string $component The target component + * + * @return object The JObject of permission/authorised actions + * **/ - public static function getActions($view,&$record = null,$views = null) + public static function getActions($view, &$record = null, $views = null, $target = null, $component = 'supportgroups') { - jimport('joomla.access.access'); - - $user = JFactory::getUser(); - $result = new JObject; - $view = self::safeString($view); + // get the user object + $user = JFactory::getUser(); + // load the JObject + $result = new JObject; + // make view name safe (just incase) + $view = self::safeString($view); if (self::checkString($views)) { $views = self::safeString($views); - } + } // get all actions from component - $actions = JAccess::getActions('com_supportgroups', 'component'); - // set acctions only set in component settiongs - $componentActions = array('core.admin','core.manage','core.options','core.export'); + $actions = JAccess::getActionsFromFile( + JPATH_ADMINISTRATOR . '/components/com_' . $component . '/access.xml', + "/access/section[@name='component']/" + ); + // if non found then return empty JObject + if (empty($actions)) + { + return $result; + } + // get created by if not found + if (self::checkObject($record) && !isset($record->created_by) && isset($record->id)) + { + $record->created_by = self::getVar($view, $record->id, 'id', 'created_by', '=', $component); + } + // set actions only set in component settings + $componentActions = array('core.admin', 'core.manage', 'core.options', 'core.export'); + // check if we have a target + $checkTarget = false; + if ($target) + { + // convert to an array + if (self::checkString($target)) + { + $target = array($target); + } + // check if we are good to go + if (self::checkArray($target)) + { + $checkTarget = true; + } + } // loop the actions and set the permissions foreach ($actions as $action) { + // check target action filter + if ($checkTarget && self::filterActions($view, $action->name, $target)) + { + continue; + } // set to use component default $fallback = true; - if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name,$componentActions)) + // reset permission per/action + $permission = false; + $catpermission = false; + // set area + $area = 'comp'; + // check if the record has an ID and the action is item related (not a component action) + if (self::checkObject($record) && isset($record->id) && $record->id > 0 && !in_array($action->name, $componentActions) && + (strpos($action->name, 'core.') !== false || strpos($action->name, $view . '.') !== false)) { + // we are in item + $area = 'item'; // The record has been set. Check the record permissions. - $permission = $user->authorise($action->name, 'com_supportgroups.'.$view.'.' . (int) $record->id); - if (!$permission) // TODO removed && !is_null($permission) + $permission = $user->authorise($action->name, 'com_' . $component . '.' . $view . '.' . (int) $record->id); + // if no permission found, check edit own + if (!$permission) { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') + // With edit, if the created_by matches current user then dig deeper. + if (($action->name === 'core.edit' || $action->name === $view . '.edit') && $record->created_by > 0 && ($record->created_by == $user->id)) { - if ($user->authorise('core.edit.own', 'com_supportgroups.'.$view.'.' . (int) $record->id)) + // the correct target + $coreCheck = (array) explode('.', $action->name); + // check that we have both local and global access + if ($user->authorise($coreCheck[0] . '.edit.own', 'com_' . $component . '.' . $view . '.' . (int) $record->id) && + $user->authorise($coreCheck[0] . '.edit.own', 'com_' . $component)) { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } + // allow edit + $result->set($action->name, true); + // set not to use global default + // because we already validated it + $fallback = false; } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups.'.$view.'.' . (int) $record->id)) + else { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise('core.edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } + // do not allow edit + $result->set($action->name, false); + $fallback = false; } } } elseif (self::checkString($views) && isset($record->catid) && $record->catid > 0) { + // we are in item + $area = 'category'; + // set the core check + $coreCheck = explode('.', $action->name); + $core = $coreCheck[0]; // make sure we use the core. action check for the categories - if (strpos($action->name,$view) !== false && strpos($action->name,'core.') === false ) { - $coreCheck = explode('.',$action->name); - $coreCheck[0] = 'core'; - $categoryCheck = implode('.',$coreCheck); + if (strpos($action->name, $view) !== false && strpos($action->name, 'core.') === false ) + { + $coreCheck[0] = 'core'; + $categoryCheck = implode('.', $coreCheck); } else { $categoryCheck = $action->name; } // The record has a category. Check the category permissions. - $catpermission = $user->authorise($categoryCheck, 'com_supportgroups.'.$views.'.category.' . (int) $record->catid); + $catpermission = $user->authorise($categoryCheck, 'com_' . $component . '.' . $views . '.category.' . (int) $record->catid); if (!$catpermission && !is_null($catpermission)) { - if ($action->name == 'core.edit' || $action->name == $view.'.edit') + // With edit, if the created_by matches current user then dig deeper. + if (($action->name === 'core.edit' || $action->name === $view . '.edit') && $record->created_by > 0 && ($record->created_by == $user->id)) { - if ($user->authorise('core.edit.own', 'com_supportgroups.'.$views.'.category.' . (int) $record->catid)) + // check that we have both local and global access + if ($user->authorise('core.edit.own', 'com_' . $component . '.' . $views . '.category.' . (int) $record->catid) && + $user->authorise($core . '.edit.own', 'com_' . $component)) { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } + // allow edit + $result->set($action->name, true); + // set not to use global default + // because we already validated it + $fallback = false; } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups.'.$views.'.category.' . (int) $record->catid)) + else { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise('core.edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } - } - elseif ($user->authorise($view.'edit.own', 'com_supportgroups')) - { - // If the owner matches 'me' then allow. - if (isset($record->created_by) && $record->created_by > 0 && ($record->created_by == $user->id)) - { - $result->set($action->name, true); - // set not to use component default - $fallback = false; - } - else - { - $result->set($action->name, false); - // set not to use component default - $fallback = false; - } + // do not allow edit + $result->set($action->name, false); + $fallback = false; } } } @@ -1070,18 +1069,53 @@ abstract class SupportgroupsHelper // if allowed then fallback on component global settings if ($fallback) { - $result->set($action->name, $user->authorise($action->name, 'com_supportgroups')); + // if item/category blocks access then don't fall back on global + if ((($area === 'item') && !$permission) || (($area === 'category') && !$catpermission)) + { + // do not allow + $result->set($action->name, false); + } + // Finally remember the global settings have the final say. (even if item allow) + // The local item permissions can block, but it can't open and override of global permissions. + // Since items are created by users and global permissions is set by system admin. + else + { + $result->set($action->name, $user->authorise($action->name, 'com_' . $component)); + } } } return $result; } /** - * Check if have an json string + * Filter the action permissions * - * @input string The json string to check + * @param string $action The action to check + * @param array $targets The array of target actions * - * @returns bool true on success + * @return boolean true if action should be filtered out + * + **/ + protected static function filterActions(&$view, &$action, &$targets) + { + foreach ($targets as $target) + { + if (strpos($action, $view . '.' . $target) !== false || + strpos($action, 'core.' . $target) !== false) + { + return false; + break; + } + } + return true; + } + + /** + * Check if have an json string + * + * @input string The json string to check + * + * @returns bool true on success **/ public static function checkJson($string) { @@ -1094,11 +1128,11 @@ abstract class SupportgroupsHelper } /** - * Check if have an object with a length + * Check if have an object with a length * - * @input object The object to check + * @input object The object to check * - * @returns bool true on success + * @returns bool true on success **/ public static function checkObject($object) { @@ -1110,15 +1144,15 @@ abstract class SupportgroupsHelper } /** - * Check if have an array with a length + * Check if have an array with a length * - * @input array The array to check + * @input array The array to check * - * @returns bool true on success + * @returns bool/int number of items in array on success **/ public static function checkArray($array, $removeEmptyString = false) { - if (isset($array) && is_array($array) && count($array) > 0) + if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0) { // also make sure the empty strings are removed if ($removeEmptyString) @@ -1132,17 +1166,17 @@ abstract class SupportgroupsHelper } return self::checkArray($array, false); } - return true; + return $nr; } return false; } /** - * Check if have a string with a length + * Check if have a string with a length * - * @input string The string to check + * @input string The string to check * - * @returns bool true on success + * @returns bool true on success **/ public static function checkString($string) { @@ -1154,10 +1188,10 @@ abstract class SupportgroupsHelper } /** - * Check if we are connected - * Thanks https://stackoverflow.com/a/4860432/1429677 + * Check if we are connected + * Thanks https://stackoverflow.com/a/4860432/1429677 * - * @returns bool true on success + * @returns bool true on success **/ public static function isConnected() { @@ -1179,11 +1213,11 @@ abstract class SupportgroupsHelper } /** - * Merge an array of array's + * Merge an array of array's * - * @input array The arrays you would like to merge + * @input array The arrays you would like to merge * - * @returns array on success + * @returns array on success **/ public static function mergeArrays($arrays) { @@ -1209,11 +1243,11 @@ abstract class SupportgroupsHelper } /** - * Shorten a string + * Shorten a string * - * @input string The you would like to shorten + * @input string The you would like to shorten * - * @returns string on success + * @returns string on success **/ public static function shorten($string, $length = 40, $addTip = true) { @@ -1221,7 +1255,7 @@ abstract class SupportgroupsHelper { $initial = strlen($string); $words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE); - $words_count = count($words); + $words_count = count((array)$words); $word_length = 0; $last_word = 0; @@ -1250,13 +1284,13 @@ abstract class SupportgroupsHelper } /** - * Making strings safe (various ways) + * Making strings safe (various ways) * - * @input string The you would like to make safe + * @input string The you would like to make safe * - * @returns string on success + * @returns string on success **/ - public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true) + public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true) { if ($replaceNumbers === true) { @@ -1285,7 +1319,16 @@ abstract class SupportgroupsHelper $string = trim($string); $string = preg_replace('/'.$spacer.'+/', ' ', $string); $string = preg_replace('/\s+/', ' ', $string); - $string = preg_replace("/[^A-Za-z ]/", '', $string); + // remove all and keep only characters + if ($keepOnlyCharacters) + { + $string = preg_replace("/[^A-Za-z ]/", '', $string); + } + // keep both numbers and characters + else + { + $string = preg_replace("/[^A-Za-z0-9 ]/", '', $string); + } // select final adaptations if ($type === 'L' || $type === 'strtolower') { @@ -1385,11 +1428,11 @@ abstract class SupportgroupsHelper } /** - * Convert an integer into an English word string - * Thanks to Tom Nicholson + * Convert an integer into an English word string + * Thanks to Tom Nicholson * - * @input an int - * @returns a string + * @input an int + * @returns a string **/ public static function numberToString($x) { @@ -1476,9 +1519,9 @@ abstract class SupportgroupsHelper } /** - * Random Key + * Random Key * - * @returns a string + * @returns a string **/ public static function randomkey($size) { diff --git a/site/models/ajax.php b/site/models/ajax.php index 97ad083..4339d13 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage ajax.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/site/models/map.php b/site/models/map.php index ed3af9a..8a10010 100644 --- a/site/models/map.php +++ b/site/models/map.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 366 of this MVC - @build 5th July, 2016 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage map.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Supportgroups Model for Map */ @@ -102,7 +99,7 @@ class SupportgroupsModelMap extends JModelList // redirect away to the home page if no access allowed. $app->redirect(JURI::root()); return false; - } + } // load parent items $items = parent::getItems(); @@ -117,19 +114,18 @@ class SupportgroupsModelMap extends JModelList // Always create a slug for sef URL's $item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id; } - } + } // return items return $items; - } - + } /** - * Get the uikit needed components - * - * @return mixed An array of objects on success. - * - */ + * Get the uikit needed components + * + * @return mixed An array of objects on success. + * + */ public function getUikitComp() { if (isset($this->uikitComp) && SupportgroupsHelper::checkArray($this->uikitComp)) @@ -137,5 +133,5 @@ class SupportgroupsModelMap extends JModelList return $this->uikitComp; } return false; - } + } } diff --git a/site/models/supportgroups.php b/site/models/supportgroups.php index 3978524..a32fe30 100644 --- a/site/models/supportgroups.php +++ b/site/models/supportgroups.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 390 of this MVC - @build 1st April, 2017 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Supportgroups Model for Supportgroups */ @@ -140,7 +137,7 @@ class SupportgroupsModelSupportgroups extends JModelList // redirect away to the home page if no access allowed. $app->redirect(JURI::root()); return false; - } + } // Does not work on all servers @@ -159,6 +156,7 @@ class SupportgroupsModelSupportgroups extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id; + // Check if we can decode info if (SupportgroupsHelper::checkJson($item->info)) { // Decode info @@ -168,19 +166,18 @@ class SupportgroupsModelSupportgroups extends JModelList $item->children = (int) $item->male_children + (int) $item->female_children; $item->on_art = (int) $item->male_art + (int) $item->female_art; } - } + } // return items return $items; - } - + } /** - * Get the uikit needed components - * - * @return mixed An array of objects on success. - * - */ + * Get the uikit needed components + * + * @return mixed An array of objects on success. + * + */ public function getUikitComp() { if (isset($this->uikitComp) && SupportgroupsHelper::checkArray($this->uikitComp)) @@ -188,5 +185,5 @@ class SupportgroupsModelSupportgroups extends JModelList return $this->uikitComp; } return false; - } + } } diff --git a/site/router.php b/site/router.php index 90cd63f..69ae662 100644 --- a/site/router.php +++ b/site/router.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage router.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file diff --git a/site/supportgroups.php b/site/supportgroups.php index 860f69c..15f5222 100644 --- a/site/supportgroups.php +++ b/site/supportgroups.php @@ -6,25 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +JHtml::_('behavior.tabstate'); // Set the component css/js $document = JFactory::getDocument(); @@ -32,18 +33,14 @@ $document->addStyleSheet('components/com_supportgroups/assets/css/site.css'); $document->addScript('components/com_supportgroups/assets/js/site.js'); // Require helper files -JLoader::register('SupportgroupsHelper', dirname(__FILE__) . '/helpers/supportgroups.php'); -JLoader::register('SupportgroupsHelperRoute', dirname(__FILE__) . '/helpers/route.php'); - -// import joomla controller library -jimport('joomla.application.component.controller'); +JLoader::register('SupportgroupsHelper', __DIR__ . '/helpers/supportgroups.php'); +JLoader::register('SupportgroupsHelperRoute', __DIR__ . '/helpers/route.php'); // Get an instance of the controller prefixed by Supportgroups $controller = JControllerLegacy::getInstance('Supportgroups'); // Perform the request task -$jinput = JFactory::getApplication()->input; -$controller->execute($jinput->get('task', null, 'CMD')); +$controller->execute(JFactory::getApplication()->input->get('task')); // Redirect if set by the controller $controller->redirect(); diff --git a/site/views/map/tmpl/default.php b/site/views/map/tmpl/default.php index e8af940..1dc0d1a 100644 --- a/site/views/map/tmpl/default.php +++ b/site/views/map/tmpl/default.php @@ -6,31 +6,31 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 366 of this MVC - @build 5th July, 2016 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); // get modules $model_behind_map = $this->getModules('behind-map','div','uk-panel'); ?> -toolbar->render(); ?> +toolbar->render(); ?> backToRef; ?>
@@ -92,4 +92,4 @@ function printMe(name, printDivId) { printWindow.focus(); } - + diff --git a/site/views/map/view.html.php b/site/views/map/view.html.php index f4130e7..981fde1 100644 --- a/site/views/map/view.html.php +++ b/site/views/map/view.html.php @@ -6,28 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 366 of this MVC - @build 5th July, 2016 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); - -// import Joomla view library -jimport('joomla.application.component.view'); +defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.module.helper'); /** @@ -100,7 +97,7 @@ class SupportgroupsViewMap extends JViewLegacy */ public function getGoogleAPI() { - $api_key = $this->params->get('api-key'); + $api_key = $this->params->get('api_key'); if ($api_key) { return 'https://maps.googleapis.com/maps/api/js?key='.$api_key.'&callback=getMapScript'; @@ -148,7 +145,7 @@ class SupportgroupsViewMap extends JViewLegacy // Load the header checker class. require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' ); // Initialize the header checker. - $HeaderCheck = new supportgroupsHeaderCheck; + $HeaderCheck = new supportgroupsHeaderCheck; // Load uikit options. $uikit = $this->params->get('uikit_load'); @@ -201,7 +198,7 @@ class SupportgroupsViewMap extends JViewLegacy } } } - } + } // load the meta description if ($this->params->get('menu-meta_description')) { @@ -216,7 +213,7 @@ class SupportgroupsViewMap extends JViewLegacy if ($this->params->get('robots')) { $this->document->setMetadata('robots', $this->params->get('robots')); - } + } // Add the JavaScript for JStore $this->document->addScript(JURI::root() .'media/com_supportgroups/js/jquery.json.min.js'); $this->document->addScript(JURI::root() .'media/com_supportgroups/js/jstorage.min.js'); @@ -293,7 +290,7 @@ class SupportgroupsViewMap extends JViewLegacy #global { height: 600px; } - "); + "); // Set the Custom JS script to view $this->document->addScriptDeclaration(" // set ajax diff --git a/site/views/supportgroups/tmpl/default.php b/site/views/supportgroups/tmpl/default.php index 399fdcb..725d37d 100644 --- a/site/views/supportgroups/tmpl/default.php +++ b/site/views/supportgroups/tmpl/default.php @@ -6,31 +6,31 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 390 of this MVC - @build 1st April, 2017 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); // get modules $model_behind_map = $this->getModules('behind-table','div','uk-panel'); ?> -toolbar->render(); ?> +toolbar->render(); ?> items) && SupportgroupsHelper::checkArray($this->items)): ?>
+ get('region.edit')): ?> - escape($item->name); ?> - checked_out): ?> - name, $item->checked_out_time, 'regions.', $canCheckin); ?> - + escape($item->name); ?> + checked_out): ?> + name, $item->checked_out_time, 'regions.', $canCheckin); ?> + -
escape($item->name); ?>
+ escape($item->name); ?> 		diff --git a/admin/layouts/country/settings_above.php b/admin/layouts/country/settings_above.php index 670c08b..2495936 100644 --- a/admin/layouts/country/settings_above.php +++ b/admin/layouts/country/settings_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/country/settings_left.php b/admin/layouts/country/settings_left.php index 70122bb..d7a213d 100644 --- a/admin/layouts/country/settings_left.php +++ b/admin/layouts/country/settings_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -36,20 +35,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/settings_right.php b/admin/layouts/country/settings_right.php index 53045b0..ba2800f 100644 --- a/admin/layouts/country/settings_right.php +++ b/admin/layouts/country/settings_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -36,20 +35,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 0aea828..de045a9 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 2b422ba..dcd885e 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -38,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 4788417..37bd1d8 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -38,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/metadata.php b/admin/layouts/currency/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/currency/metadata.php +++ b/admin/layouts/currency/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility/location_fullwidth.php b/admin/layouts/facility/location_fullwidth.php index 1aff1b8..a490522 100644 --- a/admin/layouts/facility/location_fullwidth.php +++ b/admin/layouts/facility/location_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage location_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'note_set_marker' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/facility/metadata.php b/admin/layouts/facility/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/facility/metadata.php +++ b/admin/layouts/facility/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/facility/publishing.php b/admin/layouts/facility/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/facility/publishing.php +++ b/admin/layouts/facility/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility/settings_above.php b/admin/layouts/facility/settings_above.php index 670c08b..2495936 100644 --- a/admin/layouts/facility/settings_above.php +++ b/admin/layouts/facility/settings_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/facility/settings_fullwidth.php b/admin/layouts/facility/settings_fullwidth.php index 7f05058..38f0130 100644 --- a/admin/layouts/facility/settings_fullwidth.php +++ b/admin/layouts/facility/settings_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'details' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/facility/settings_left.php b/admin/layouts/facility/settings_left.php index ae4318d..3727a82 100644 --- a/admin/layouts/facility/settings_left.php +++ b/admin/layouts/facility/settings_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility/settings_right.php b/admin/layouts/facility/settings_right.php index ec27d63..cab2efa 100644 --- a/admin/layouts/facility/settings_right.php +++ b/admin/layouts/facility/settings_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility/settings_under.php b/admin/layouts/facility/settings_under.php index 79bbdbd..ce2aaf4 100644 --- a/admin/layouts/facility/settings_under.php +++ b/admin/layouts/facility/settings_under.php @@ -6,36 +6,40 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage settings_under.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'marker' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/facility_type/details_left.php b/admin/layouts/facility_type/details_left.php index d6a6ca3..7577b1a 100644 --- a/admin/layouts/facility_type/details_left.php +++ b/admin/layouts/facility_type/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility_type/details_right.php b/admin/layouts/facility_type/details_right.php index ed92110..a2a6d7b 100644 --- a/admin/layouts/facility_type/details_right.php +++ b/admin/layouts/facility_type/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility_type/publishing.php b/admin/layouts/facility_type/publishing.php index 311b53c..a2d1048 100644 --- a/admin/layouts/facility_type/publishing.php +++ b/admin/layouts/facility_type/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/facility_type/publlshing.php b/admin/layouts/facility_type/publlshing.php index 1c1a486..0e7854a 100644 --- a/admin/layouts/facility_type/publlshing.php +++ b/admin/layouts/facility_type/publlshing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 84bd830..60eb922 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'title', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index a4eda73..ea23b0e 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'content' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index f7019f6..c320534 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -39,20 +38,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index b5e5e34..4156d01 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -37,20 +36,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 3df2fdc..e82194f 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -6,36 +6,40 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_under.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'not_required' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 311b53c..a2d1048 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 1c1a486..0e7854a 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/info_type/details_left.php b/admin/layouts/info_type/details_left.php index d6a6ca3..7577b1a 100644 --- a/admin/layouts/info_type/details_left.php +++ b/admin/layouts/info_type/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/info_type/details_right.php b/admin/layouts/info_type/details_right.php index ed92110..a2a6d7b 100644 --- a/admin/layouts/info_type/details_right.php +++ b/admin/layouts/info_type/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/info_type/publishing.php b/admin/layouts/info_type/publishing.php index 311b53c..a2d1048 100644 --- a/admin/layouts/info_type/publishing.php +++ b/admin/layouts/info_type/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/info_type/publlshing.php b/admin/layouts/info_type/publlshing.php index 1c1a486..0e7854a 100644 --- a/admin/layouts/info_type/publlshing.php +++ b/admin/layouts/info_type/publlshing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/payment/details_above.php b/admin/layouts/payment/details_above.php index fc8c537..54f7f7e 100644 --- a/admin/layouts/payment/details_above.php +++ b/admin/layouts/payment/details_above.php @@ -6,36 +6,40 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'support_group' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/payment/details_left.php b/admin/layouts/payment/details_left.php index 6caed4b..a8e98b4 100644 --- a/admin/layouts/payment/details_left.php +++ b/admin/layouts/payment/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/payment/details_right.php b/admin/layouts/payment/details_right.php index f3ee901..26cb8ee 100644 --- a/admin/layouts/payment/details_right.php +++ b/admin/layouts/payment/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/payment/publishing.php b/admin/layouts/payment/publishing.php index 311b53c..a2d1048 100644 --- a/admin/layouts/payment/publishing.php +++ b/admin/layouts/payment/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -39,20 +37,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/payment/publlshing.php b/admin/layouts/payment/publlshing.php index 1c1a486..0e7854a 100644 --- a/admin/layouts/payment/publlshing.php +++ b/admin/layouts/payment/publlshing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -41,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/region/details_above.php b/admin/layouts/region/details_above.php index 0aea828..de045a9 100644 --- a/admin/layouts/region/details_above.php +++ b/admin/layouts/region/details_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/region/details_right.php b/admin/layouts/region/details_right.php index 1be54d1..62c6ef7 100644 --- a/admin/layouts/region/details_right.php +++ b/admin/layouts/region/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/region/metadata.php b/admin/layouts/region/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/region/metadata.php +++ b/admin/layouts/region/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/region/publishing.php b/admin/layouts/region/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/region/publishing.php +++ b/admin/layouts/region/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/support_group/details_above.php b/admin/layouts/support_group/details_above.php index 0aea828..de045a9 100644 --- a/admin/layouts/support_group/details_above.php +++ b/admin/layouts/support_group/details_above.php @@ -6,37 +6,41 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_above.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'name', 'alias' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/support_group/details_fullwidth.php b/admin/layouts/support_group/details_fullwidth.php index 2ef2913..3e2f8f6 100644 --- a/admin/layouts/support_group/details_fullwidth.php +++ b/admin/layouts/support_group/details_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'details' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/support_group/details_left.php b/admin/layouts/support_group/details_left.php index 1f8eb52..8635214 100644 --- a/admin/layouts/support_group/details_left.php +++ b/admin/layouts/support_group/details_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -37,20 +36,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/support_group/details_right.php b/admin/layouts/support_group/details_right.php index 9d1f64e..9fcd59e 100644 --- a/admin/layouts/support_group/details_right.php +++ b/admin/layouts/support_group/details_right.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_right.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -40,20 +39,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/support_group/details_under.php b/admin/layouts/support_group/details_under.php index 7950862..7a5224c 100644 --- a/admin/layouts/support_group/details_under.php +++ b/admin/layouts/support_group/details_under.php @@ -6,36 +6,40 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage details_under.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); -$fields = array( +$fields = $displayData->get('fields') ?: array( 'marker' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- renderField($field); - } ?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/support_group/location_fullwidth.php b/admin/layouts/support_group/location_fullwidth.php index 1aff1b8..a490522 100644 --- a/admin/layouts/support_group/location_fullwidth.php +++ b/admin/layouts/support_group/location_fullwidth.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage location_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -33,16 +32,14 @@ $fields = $displayData->get('fields') ?: array( 'note_set_marker' ); +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> +
diff --git a/admin/layouts/support_group/location_left.php b/admin/layouts/support_group/location_left.php index ebbb39c..74f4524 100644 --- a/admin/layouts/support_group/location_left.php +++ b/admin/layouts/support_group/location_left.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage location_left.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); @@ -35,20 +34,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/support_group/metadata.php b/admin/layouts/support_group/metadata.php index 48152c0..2024fc3 100644 --- a/admin/layouts/support_group/metadata.php +++ b/admin/layouts/support_group/metadata.php @@ -6,25 +6,24 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage metadata.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); diff --git a/admin/layouts/support_group/payments_fullwidth.php b/admin/layouts/support_group/payments_fullwidth.php index 8bbedee..9a9b4ac 100644 --- a/admin/layouts/support_group/payments_fullwidth.php +++ b/admin/layouts/support_group/payments_fullwidth.php @@ -6,34 +6,53 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage payments_fullwidth.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vvvpayments; -$user = JFactory::getUser(); -$id = $displayData->item->id; +$items = $displayData->vvvpayments; +$user = JFactory::getUser(); +$id = $displayData->item->id; +// set the edit URL $edit = "index.php?option=com_supportgroups&view=payments&task=payment.edit"; -$ref = ($id) ? "&ref=support_group&refid=".$id : ""; -$new = "index.php?option=com_supportgroups&view=payment&layout=edit".$ref; +// set a return value +$return = ($id) ? "index.php?option=com_supportgroups&view=support_group&layout=edit&id=" . $id : ""; +// check for a return value +$jinput = JFactory::getApplication()->input; +if ($_return = $jinput->get('return', null, 'base64')) +{ + $return .= "&return=" . $_return; +} +// check if return value was set +if (SupportgroupsHelper::checkString($return)) +{ + // set the referral values + $ref = ($id) ? "&ref=support_group&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return)); +} +else +{ + $ref = ($id) ? "&ref=support_group&refid=" . $id : ""; +} +// set the create new URL +$new = "index.php?option=com_supportgroups&view=payments&task=payment.edit" . $ref; +// load the action object $can = SupportgroupsHelper::getActions('payment'); ?> @@ -70,15 +89,8 @@ $can = SupportgroupsHelper::getActions('payment'); $canDo = SupportgroupsHelper::getActions('payment',$item,'payments'); ?>
- get('payment.edit')): ?> - escape($item->support_group_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'payments.', $canCheckin); ?> - - -
escape($item->support_group_name); ?>
- + 		+ escape($item->support_group_name); ?> year); ?> diff --git a/admin/layouts/support_group/publishing.php b/admin/layouts/support_group/publishing.php index 2265b9a..ca80d99 100644 --- a/admin/layouts/support_group/publishing.php +++ b/admin/layouts/support_group/publishing.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage publishing.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file - defined('_JEXEC') or die('Restricted access'); -$app = JFactory::getApplication(); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( @@ -45,20 +43,10 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); -foreach ($fields as $field) -{ - $field = is_array($field) ? $field : array($field); - foreach ($field as $f) - { - if ($form->getField($f)) - { - if (in_array($f, $hiddenFields)) - { - $form->setFieldAttribute($f, 'type', 'hidden'); - } - - echo $form->renderField($f); - break; - } - } -} +?> + + + setFieldAttribute($field, 'type', 'hidden'); ?> + + renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/models/additional_info.php b/admin/models/additional_info.php index 4a2bc4e..55d8b2d 100644 --- a/admin/models/additional_info.php +++ b/admin/models/additional_info.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_info.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Additional_info Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelAdditional_info extends JModelAdmin */ public function getTable($type = 'additional_info', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -107,10 +107,10 @@ class SupportgroupsModelAdditional_info extends JModelAdmin } /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getVvwsupport_groups() { // Get the user object. @@ -162,11 +162,9 @@ class SupportgroupsModelAdditional_info extends JModelAdmin // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('support_group.access', 'com_supportgroups.support_group.' . (int) $item->id) && $user->authorise('support_group.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('support_group.access', 'com_supportgroups.support_group.' . (int) $item->id) && JFactory::getUser()->authorise('support_group.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -205,22 +203,25 @@ class SupportgroupsModelAdditional_info extends JModelAdmin return $items; } return false; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.additional_info', 'additional_info', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.additional_info', 'additional_info', $options); if (empty($form)) { @@ -288,6 +289,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -304,6 +306,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $form->setFieldAttribute('info_type', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('info_type', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('info_type')) { // Disable fields while saving. @@ -320,6 +323,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $form->setFieldAttribute('details', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('details', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('details')) { // Disable fields while saving. @@ -336,6 +340,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. @@ -347,17 +352,20 @@ class SupportgroupsModelAdditional_info extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -408,7 +416,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -516,7 +524,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -674,7 +682,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -772,7 +780,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -806,7 +814,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -817,7 +825,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -938,7 +946,7 @@ class SupportgroupsModelAdditional_info extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -994,13 +1002,13 @@ class SupportgroupsModelAdditional_info extends JModelAdmin } /** - * Method to change the title - * - * @param string $title The title. - * - * @return array Contains the modified title and alias. - * - */ + * Method to change the title + * + * @param string $title The title. + * + * @return array Contains the modified title and alias. + * + */ protected function _generateNewTitle($title) { diff --git a/admin/models/additional_information.php b/admin/models/additional_information.php index b4faf35..a55d50e 100644 --- a/admin/models/additional_information.php +++ b/admin/models/additional_information.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_information.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Additional_information Model */ @@ -100,7 +97,7 @@ class SupportgroupsModelAdditional_information extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -110,11 +107,9 @@ class SupportgroupsModelAdditional_information extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('additional_info.access', 'com_supportgroups.additional_info.' . (int) $item->id) && $user->authorise('additional_info.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups.additional_info.' . (int) $item->id) && JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -122,7 +117,7 @@ class SupportgroupsModelAdditional_information extends JModelList } } - } + } // return items return $items; @@ -209,10 +204,10 @@ class SupportgroupsModelAdditional_information extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -252,11 +247,9 @@ class SupportgroupsModelAdditional_information extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('additional_info.access', 'com_supportgroups.additional_info.' . (int) $item->id) && $user->authorise('additional_info.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups.additional_info.' . (int) $item->id) && JFactory::getUser()->authorise('additional_info.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -306,7 +299,7 @@ class SupportgroupsModelAdditional_information extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -330,16 +323,16 @@ class SupportgroupsModelAdditional_information extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 3955a2e..7752a5c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -6,28 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage ajax.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -jimport('joomla.application.component.helper'); - /** * Supportgroups Ajax Model */ diff --git a/admin/models/area.php b/admin/models/area.php index 496a854..c378125 100644 --- a/admin/models/area.php +++ b/admin/models/area.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Area Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelArea extends JModelAdmin */ public function getTable($type = 'area', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -107,10 +107,10 @@ class SupportgroupsModelArea extends JModelAdmin } /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getVvxsupport_groups() { // Get the user object. @@ -177,11 +177,9 @@ class SupportgroupsModelArea extends JModelAdmin // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('support_group.access', 'com_supportgroups.support_group.' . (int) $item->id) && $user->authorise('support_group.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('support_group.access', 'com_supportgroups.support_group.' . (int) $item->id) && JFactory::getUser()->authorise('support_group.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -193,22 +191,25 @@ class SupportgroupsModelArea extends JModelAdmin return $items; } return false; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.area', 'area', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.area', 'area', $options); if (empty($form)) { @@ -276,6 +277,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -292,6 +294,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('area_type', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('area_type', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('area_type')) { // Disable fields while saving. @@ -308,6 +311,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('region', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('region', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('region')) { // Disable fields while saving. @@ -324,6 +328,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('details', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('details', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('details')) { // Disable fields while saving. @@ -340,6 +345,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('color', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('color', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('color')) { // Disable fields while saving. @@ -356,6 +362,7 @@ class SupportgroupsModelArea extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. @@ -367,17 +374,20 @@ class SupportgroupsModelArea extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -428,7 +438,7 @@ class SupportgroupsModelArea extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -536,7 +546,7 @@ class SupportgroupsModelArea extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -694,7 +704,7 @@ class SupportgroupsModelArea extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -787,7 +797,7 @@ class SupportgroupsModelArea extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -821,7 +831,7 @@ class SupportgroupsModelArea extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -832,7 +842,7 @@ class SupportgroupsModelArea extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -953,7 +963,7 @@ class SupportgroupsModelArea extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -1062,14 +1072,14 @@ class SupportgroupsModelArea extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/area_type.php b/admin/models/area_type.php index c68c2eb..2070dcd 100644 --- a/admin/models/area_type.php +++ b/admin/models/area_type.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_type.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Area_type Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelArea_type extends JModelAdmin */ public function getTable($type = 'area_type', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -103,22 +103,25 @@ class SupportgroupsModelArea_type extends JModelAdmin } return $item; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.area_type', 'area_type', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.area_type', 'area_type', $options); if (empty($form)) { @@ -186,6 +189,7 @@ class SupportgroupsModelArea_type extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -202,6 +206,7 @@ class SupportgroupsModelArea_type extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. @@ -213,17 +218,20 @@ class SupportgroupsModelArea_type extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -274,7 +282,7 @@ class SupportgroupsModelArea_type extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -382,7 +390,7 @@ class SupportgroupsModelArea_type extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -540,7 +548,7 @@ class SupportgroupsModelArea_type extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -633,7 +641,7 @@ class SupportgroupsModelArea_type extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -667,7 +675,7 @@ class SupportgroupsModelArea_type extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -678,7 +686,7 @@ class SupportgroupsModelArea_type extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -799,7 +807,7 @@ class SupportgroupsModelArea_type extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -908,14 +916,14 @@ class SupportgroupsModelArea_type extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/area_types.php b/admin/models/area_types.php index c1f13c7..d18f2a2 100644 --- a/admin/models/area_types.php +++ b/admin/models/area_types.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_types.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Area_types Model */ @@ -96,7 +93,7 @@ class SupportgroupsModelArea_types extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -106,11 +103,9 @@ class SupportgroupsModelArea_types extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('area_type.access', 'com_supportgroups.area_type.' . (int) $item->id) && $user->authorise('area_type.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('area_type.access', 'com_supportgroups.area_type.' . (int) $item->id) && JFactory::getUser()->authorise('area_type.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -118,7 +113,7 @@ class SupportgroupsModelArea_types extends JModelList } } - } + } // return items return $items; @@ -196,10 +191,10 @@ class SupportgroupsModelArea_types extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -239,11 +234,9 @@ class SupportgroupsModelArea_types extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('area_type.access', 'com_supportgroups.area_type.' . (int) $item->id) && $user->authorise('area_type.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('area_type.access', 'com_supportgroups.area_type.' . (int) $item->id) && JFactory::getUser()->authorise('area_type.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -293,7 +286,7 @@ class SupportgroupsModelArea_types extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -316,16 +309,16 @@ class SupportgroupsModelArea_types extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/areas.php b/admin/models/areas.php index 16adeda..ea20791 100644 --- a/admin/models/areas.php +++ b/admin/models/areas.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage areas.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Areas Model */ @@ -104,7 +101,7 @@ class SupportgroupsModelAreas extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -114,11 +111,9 @@ class SupportgroupsModelAreas extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('area.access', 'com_supportgroups.area.' . (int) $item->id) && $user->authorise('area.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('area.access', 'com_supportgroups.area.' . (int) $item->id) && JFactory::getUser()->authorise('area.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -135,7 +130,7 @@ class SupportgroupsModelAreas extends JModelList { $item->color = ''; } - } + } // return items return $items; @@ -231,10 +226,10 @@ class SupportgroupsModelAreas extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -274,11 +269,9 @@ class SupportgroupsModelAreas extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('area.access', 'com_supportgroups.area.' . (int) $item->id) && $user->authorise('area.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('area.access', 'com_supportgroups.area.' . (int) $item->id) && JFactory::getUser()->authorise('area.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -337,7 +330,7 @@ class SupportgroupsModelAreas extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -362,16 +355,16 @@ class SupportgroupsModelAreas extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/countries.php b/admin/models/countries.php index e079946..05a8e8f 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage countries.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Countries Model */ @@ -112,7 +109,7 @@ class SupportgroupsModelCountries extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -122,11 +119,9 @@ class SupportgroupsModelCountries extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('country.access', 'com_supportgroups.country.' . (int) $item->id) && $user->authorise('country.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('country.access', 'com_supportgroups.country.' . (int) $item->id) && JFactory::getUser()->authorise('country.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -134,7 +129,7 @@ class SupportgroupsModelCountries extends JModelList } } - } + } // return items return $items; @@ -226,10 +221,10 @@ class SupportgroupsModelCountries extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -269,11 +264,9 @@ class SupportgroupsModelCountries extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('country.access', 'com_supportgroups.country.' . (int) $item->id) && $user->authorise('country.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('country.access', 'com_supportgroups.country.' . (int) $item->id) && JFactory::getUser()->authorise('country.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -323,7 +316,7 @@ class SupportgroupsModelCountries extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -350,16 +343,16 @@ class SupportgroupsModelCountries extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/country.php b/admin/models/country.php index d94a1dc..ce98e1d 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage country.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Country Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelCountry extends JModelAdmin */ public function getTable($type = 'country', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -107,10 +107,10 @@ class SupportgroupsModelCountry extends JModelAdmin } /** - * Method to get list data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getVvyregions() { // Get the user object. @@ -173,11 +173,9 @@ class SupportgroupsModelCountry extends JModelAdmin // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('region.access', 'com_supportgroups.region.' . (int) $item->id) && $user->authorise('region.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('region.access', 'com_supportgroups.region.' . (int) $item->id) && JFactory::getUser()->authorise('region.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -189,22 +187,25 @@ class SupportgroupsModelCountry extends JModelAdmin return $items; } return false; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.country', 'country', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.country', 'country', $options); if (empty($form)) { @@ -262,20 +263,311 @@ class SupportgroupsModelCountry extends JModelAdmin // Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } + // Modify the form based on Edit Name access controls. + if ($id != 0 && (!$user->authorise('country.edit.name', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.name', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('name', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('name')) + { + // Disable fields while saving. + $form->setFieldAttribute('name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name', 'required', 'false'); + } + } + // Modify the from the form based on Name access controls. + if ($id != 0 && (!$user->authorise('country.access.name', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.name', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('name'); + } + // Modify the form based on View Name access controls. + if ($id != 0 && (!$user->authorise('country.view.name', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.name', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('name', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('name'))) + { + // Disable fields while saving. + $form->setFieldAttribute('name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name', 'required', 'false'); + // Make sure + $form->setValue('name', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('name'); + } + } + // Modify the form based on Edit Currency access controls. + if ($id != 0 && (!$user->authorise('country.edit.currency', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.currency', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('currency', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('currency', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('currency')) + { + // Disable fields while saving. + $form->setFieldAttribute('currency', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('currency', 'required', 'false'); + } + } + // Modify the from the form based on Currency access controls. + if ($id != 0 && (!$user->authorise('country.access.currency', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.currency', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('currency'); + } + // Modify the form based on View Currency access controls. + if ($id != 0 && (!$user->authorise('country.view.currency', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.currency', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('currency', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('currency'))) + { + // Disable fields while saving. + $form->setFieldAttribute('currency', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('currency', 'required', 'false'); + // Make sure + $form->setValue('currency', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('currency'); + } + } + // Modify the form based on Edit Worldzone access controls. + if ($id != 0 && (!$user->authorise('country.edit.worldzone', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.worldzone', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('worldzone', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('worldzone', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('worldzone')) + { + // Disable fields while saving. + $form->setFieldAttribute('worldzone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('worldzone', 'required', 'false'); + } + } + // Modify the from the form based on Worldzone access controls. + if ($id != 0 && (!$user->authorise('country.access.worldzone', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.worldzone', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('worldzone'); + } + // Modify the form based on View Worldzone access controls. + if ($id != 0 && (!$user->authorise('country.view.worldzone', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.worldzone', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('worldzone', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('worldzone'))) + { + // Disable fields while saving. + $form->setFieldAttribute('worldzone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('worldzone', 'required', 'false'); + // Make sure + $form->setValue('worldzone', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('worldzone'); + } + } + // Modify the form based on Edit Codethree access controls. + if ($id != 0 && (!$user->authorise('country.edit.codethree', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.codethree', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('codethree', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('codethree', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('codethree')) + { + // Disable fields while saving. + $form->setFieldAttribute('codethree', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('codethree', 'required', 'false'); + } + } + // Modify the from the form based on Codethree access controls. + if ($id != 0 && (!$user->authorise('country.access.codethree', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.codethree', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('codethree'); + } + // Modify the form based on View Codethree access controls. + if ($id != 0 && (!$user->authorise('country.view.codethree', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.codethree', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('codethree', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('codethree'))) + { + // Disable fields while saving. + $form->setFieldAttribute('codethree', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('codethree', 'required', 'false'); + // Make sure + $form->setValue('codethree', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('codethree'); + } + } + // Modify the form based on Edit Codetwo access controls. + if ($id != 0 && (!$user->authorise('country.edit.codetwo', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.codetwo', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('codetwo', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('codetwo', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('codetwo')) + { + // Disable fields while saving. + $form->setFieldAttribute('codetwo', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('codetwo', 'required', 'false'); + } + } + // Modify the from the form based on Codetwo access controls. + if ($id != 0 && (!$user->authorise('country.access.codetwo', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.codetwo', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('codetwo'); + } + // Modify the form based on View Codetwo access controls. + if ($id != 0 && (!$user->authorise('country.view.codetwo', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.codetwo', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('codetwo', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('codetwo'))) + { + // Disable fields while saving. + $form->setFieldAttribute('codetwo', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('codetwo', 'required', 'false'); + // Make sure + $form->setValue('codetwo', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('codetwo'); + } + } + // Modify the form based on Edit Alias access controls. + if ($id != 0 && (!$user->authorise('country.edit.alias', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.edit.alias', 'com_supportgroups'))) + { + // Disable fields for display. + $form->setFieldAttribute('alias', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('alias')) + { + // Disable fields while saving. + $form->setFieldAttribute('alias', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('alias', 'required', 'false'); + } + } + // Modify the from the form based on Alias access controls. + if ($id != 0 && (!$user->authorise('country.access.alias', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.access.alias', 'com_supportgroups'))) + { + // Remove the field + $form->removeField('alias'); + } + // Modify the form based on View Alias access controls. + if ($id != 0 && (!$user->authorise('country.view.alias', 'com_supportgroups.country.' . (int) $id)) + || ($id == 0 && !$user->authorise('country.view.alias', 'com_supportgroups'))) + { + // Make the field hidded. + $form->setFieldAttribute('alias', 'type', 'hidden'); + // If there is no value continue. + if (!($val = $form->getValue('alias'))) + { + // Disable fields while saving. + $form->setFieldAttribute('alias', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('alias', 'required', 'false'); + // Make sure + $form->setValue('alias', null, ''); + } + elseif (SupportgroupsHelper::checkArray($val)) + { + // We have to unset then (TODO) + // Hiddend field can not handel array value + // Even if we conver to json we get an error + $form->removeField('alias'); + } + } // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -326,7 +618,7 @@ class SupportgroupsModelCountry extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -434,7 +726,7 @@ class SupportgroupsModelCountry extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -592,7 +884,7 @@ class SupportgroupsModelCountry extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -685,7 +977,7 @@ class SupportgroupsModelCountry extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -719,7 +1011,7 @@ class SupportgroupsModelCountry extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -730,7 +1022,7 @@ class SupportgroupsModelCountry extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -851,7 +1143,7 @@ class SupportgroupsModelCountry extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -960,14 +1252,14 @@ class SupportgroupsModelCountry extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 386b42f..cdcdcd0 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currencies.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Currencies Model */ @@ -108,7 +105,7 @@ class SupportgroupsModelCurrencies extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -118,11 +115,9 @@ class SupportgroupsModelCurrencies extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('currency.access', 'com_supportgroups.currency.' . (int) $item->id) && $user->authorise('currency.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('currency.access', 'com_supportgroups.currency.' . (int) $item->id) && JFactory::getUser()->authorise('currency.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -130,7 +125,7 @@ class SupportgroupsModelCurrencies extends JModelList } } - } + } // return items return $items; @@ -208,10 +203,10 @@ class SupportgroupsModelCurrencies extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -251,11 +246,9 @@ class SupportgroupsModelCurrencies extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('currency.access', 'com_supportgroups.currency.' . (int) $item->id) && $user->authorise('currency.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('currency.access', 'com_supportgroups.currency.' . (int) $item->id) && JFactory::getUser()->authorise('currency.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -305,7 +298,7 @@ class SupportgroupsModelCurrencies extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -331,16 +324,16 @@ class SupportgroupsModelCurrencies extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/currency.php b/admin/models/currency.php index 5049264..1e1e577 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currency.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Currency Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelCurrency extends JModelAdmin */ public function getTable($type = 'currency', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -103,22 +103,25 @@ class SupportgroupsModelCurrency extends JModelAdmin } return $item; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.currency', 'currency', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.currency', 'currency', $options); if (empty($form)) { @@ -179,17 +182,20 @@ class SupportgroupsModelCurrency extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -240,7 +246,7 @@ class SupportgroupsModelCurrency extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -348,7 +354,7 @@ class SupportgroupsModelCurrency extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -506,7 +512,7 @@ class SupportgroupsModelCurrency extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -599,7 +605,7 @@ class SupportgroupsModelCurrency extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -633,7 +639,7 @@ class SupportgroupsModelCurrency extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -644,7 +650,7 @@ class SupportgroupsModelCurrency extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -765,7 +771,7 @@ class SupportgroupsModelCurrency extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -874,14 +880,14 @@ class SupportgroupsModelCurrency extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/facilities.php b/admin/models/facilities.php index 927266d..31256a2 100644 --- a/admin/models/facilities.php +++ b/admin/models/facilities.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facilities.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Facilities Model */ @@ -108,7 +105,7 @@ class SupportgroupsModelFacilities extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -118,11 +115,9 @@ class SupportgroupsModelFacilities extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('facility.access', 'com_supportgroups.facility.' . (int) $item->id) && $user->authorise('facility.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('facility.access', 'com_supportgroups.facility.' . (int) $item->id) && JFactory::getUser()->authorise('facility.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -130,7 +125,7 @@ class SupportgroupsModelFacilities extends JModelList } } - } + } // return items return $items; @@ -217,10 +212,10 @@ class SupportgroupsModelFacilities extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -260,11 +255,9 @@ class SupportgroupsModelFacilities extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('facility.access', 'com_supportgroups.facility.' . (int) $item->id) && $user->authorise('facility.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('facility.access', 'com_supportgroups.facility.' . (int) $item->id) && JFactory::getUser()->authorise('facility.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -314,7 +307,7 @@ class SupportgroupsModelFacilities extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -340,16 +333,16 @@ class SupportgroupsModelFacilities extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/facility.php b/admin/models/facility.php index fef042d..3bae69a 100644 --- a/admin/models/facility.php +++ b/admin/models/facility.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Facility Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelFacility extends JModelAdmin */ public function getTable($type = 'facility', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -103,22 +103,25 @@ class SupportgroupsModelFacility extends JModelAdmin } return $item; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.facility', 'facility', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.facility', 'facility', $options); if (empty($form)) { @@ -186,6 +189,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -202,6 +206,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('facility_type', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('facility_type', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('facility_type')) { // Disable fields while saving. @@ -218,6 +223,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('phone', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('phone', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('phone')) { // Disable fields while saving. @@ -234,6 +240,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('details', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('details', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('details')) { // Disable fields while saving. @@ -250,6 +257,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('note_set_marker', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('note_set_marker', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('note_set_marker')) { // Disable fields while saving. @@ -266,6 +274,7 @@ class SupportgroupsModelFacility extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. @@ -277,17 +286,20 @@ class SupportgroupsModelFacility extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -338,7 +350,7 @@ class SupportgroupsModelFacility extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -446,7 +458,7 @@ class SupportgroupsModelFacility extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -604,7 +616,7 @@ class SupportgroupsModelFacility extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -697,7 +709,7 @@ class SupportgroupsModelFacility extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -731,7 +743,7 @@ class SupportgroupsModelFacility extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -742,7 +754,7 @@ class SupportgroupsModelFacility extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -863,7 +875,7 @@ class SupportgroupsModelFacility extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -972,14 +984,14 @@ class SupportgroupsModelFacility extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/facility_type.php b/admin/models/facility_type.php index 08e85ce..5fa8fab 100644 --- a/admin/models/facility_type.php +++ b/admin/models/facility_type.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_type.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -28,9 +28,6 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; -// import Joomla modelform library -jimport('joomla.application.component.modeladmin'); - /** * Supportgroups Facility_type Model */ @@ -63,6 +60,9 @@ class SupportgroupsModelFacility_type extends JModelAdmin */ public function getTable($type = 'facility_type', $prefix = 'SupportgroupsTable', $config = array()) { + // add table path for when model gets used from other component + $this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_supportgroups/tables'); + // get instance of the table return JTable::getInstance($type, $prefix, $config); } @@ -103,22 +103,25 @@ class SupportgroupsModelFacility_type extends JModelAdmin } return $item; - } + } /** * Method to get the record form. * * @param array $data Data for the form. * @param boolean $loadData True if the form is to load its own data (default case), false if not. + * @param array $options Optional array of options for the form creation. * * @return mixed A JForm object on success, false on failure * * @since 1.6 */ - public function getForm($data = array(), $loadData = true) - { + public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform')) + { + // set load data option + $options['load_data'] = $loadData; // Get the form. - $form = $this->loadForm('com_supportgroups.facility_type', 'facility_type', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_supportgroups.facility_type', 'facility_type', $options); if (empty($form)) { @@ -186,6 +189,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -202,6 +206,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. @@ -213,17 +218,20 @@ class SupportgroupsModelFacility_type extends JModelAdmin // Only load these values if no id is found if (0 == $id) { - // Set redirected field name - $redirectedField = $jinput->get('ref', null, 'STRING'); - // Set redirected field value - $redirectedValue = $jinput->get('refid', 0, 'INT'); + // Set redirected view name + $redirectedView = $jinput->get('ref', null, 'STRING'); + // Set field name (or fall back to view name) + $redirectedField = $jinput->get('field', $redirectedView, 'STRING'); + // Set redirected view id + $redirectedId = $jinput->get('refid', 0, 'INT'); + // Set field id (or fall back to redirected view id) + $redirectedValue = $jinput->get('field_id', $redirectedId, 'INT'); if (0 != $redirectedValue && $redirectedField) { // Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } @@ -274,7 +282,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin protected function canEditState($record) { $user = JFactory::getUser(); - $recordId = (!empty($record->id)) ? $record->id : 0; + $recordId = (!empty($record->id)) ? $record->id : 0; if ($recordId) { @@ -382,7 +390,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin } return $data; - } + } /** * Method to get the unique fields of this table. @@ -540,7 +548,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin * * @return mixed An array of new IDs on success, boolean false on failure. * - * @since 12.2 + * @since 12.2 */ protected function batchCopy($values, $pks, $contexts) { @@ -633,7 +641,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin $this->table->id = 0; // TODO: Deal with ordering? - // $this->table->ordering = 1; + // $this->table->ordering = 1; // Check the row. if (!$this->table->check()) @@ -667,7 +675,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin $this->cleanCache(); return $newIds; - } + } /** * Batch move items to a new category @@ -678,7 +686,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin * * @return boolean True if successful, false otherwise and internal error is set. * - * @since 12.2 + * @since 12.2 */ protected function batchMove($values, $pks, $contexts) { @@ -799,7 +807,7 @@ class SupportgroupsModelFacility_type extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) @@ -908,14 +916,14 @@ class SupportgroupsModelFacility_type extends JModelAdmin } /** - * Method to change the title/s & alias. - * - * @param string $alias The alias. - * @param string/array $title The title. - * - * @return array/string Contains the modified title/s and/or alias. - * - */ + * Method to change the title/s & alias. + * + * @param string $alias The alias. + * @param string/array $title The title. + * + * @return array/string Contains the modified title/s and/or alias. + * + */ protected function _generateNewTitle($alias, $title = null) { diff --git a/admin/models/facility_types.php b/admin/models/facility_types.php index e61a44f..1a2a156 100644 --- a/admin/models/facility_types.php +++ b/admin/models/facility_types.php @@ -6,29 +6,26 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility_types.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file defined('_JEXEC') or die('Restricted access'); -// import the Joomla modellist library -jimport('joomla.application.component.modellist'); - /** * Facility_types Model */ @@ -96,7 +93,7 @@ class SupportgroupsModelFacility_types extends JModelList * @return mixed An array of data items on success, false on failure. */ public function getItems() - { + { // check in items $this->checkInNow(); @@ -106,11 +103,9 @@ class SupportgroupsModelFacility_types extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('facility_type.access', 'com_supportgroups.facility_type.' . (int) $item->id) && $user->authorise('facility_type.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups.facility_type.' . (int) $item->id) && JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -118,7 +113,7 @@ class SupportgroupsModelFacility_types extends JModelList } } - } + } // return items return $items; @@ -196,10 +191,10 @@ class SupportgroupsModelFacility_types extends JModelList } /** - * Method to get list export data. - * - * @return mixed An array of data items on success, false on failure. - */ + * Method to get list export data. + * + * @return mixed An array of data items on success, false on failure. + */ public function getExportData($pks) { // setup the query @@ -239,11 +234,9 @@ class SupportgroupsModelFacility_types extends JModelList // set values to display correctly. if (SupportgroupsHelper::checkArray($items)) { - // get user object. - $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('facility_type.access', 'com_supportgroups.facility_type.' . (int) $item->id) && $user->authorise('facility_type.access', 'com_supportgroups')); + $access = (JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups.facility_type.' . (int) $item->id) && JFactory::getUser()->authorise('facility_type.access', 'com_supportgroups')); if (!$access) { unset($items[$nr]); @@ -293,7 +286,7 @@ class SupportgroupsModelFacility_types extends JModelList return $headers; } return false; - } + } /** * Method to get a store id based on model configuration state. @@ -316,16 +309,16 @@ class SupportgroupsModelFacility_types extends JModelList } /** - * Build an SQL query to checkin all items left checked out longer then a set time. - * - * @return a bool - * - */ + * Build an SQL query to checkin all items left checked out longer then a set time. + * + * @return a bool + * + */ protected function checkInNow() { // Get set check in time $time = JComponentHelper::getParams('com_supportgroups')->get('check_in'); - + if ($time) { diff --git a/admin/models/fields/additionalinfo.php b/admin/models/fields/additionalinfo.php index 6f9709f..58fb609 100644 --- a/admin/models/fields/additionalinfo.php +++ b/admin/models/fields/additionalinfo.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage additionalinfo.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldAdditionalinfo extends JFormFieldCheckboxes /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 61b9bf9..dcdfe15 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage adminviewfolderlist.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { // get custom folder files $localfolder = JPATH_COMPONENT_ADMINISTRATOR.'/views'; diff --git a/admin/models/fields/areas.php b/admin/models/fields/areas.php index 29ed4cf..599dee8 100644 --- a/admin/models/fields/areas.php +++ b/admin/models/fields/areas.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage areas.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldAreas extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create area @@ -146,9 +152,9 @@ class JFormFieldAreas extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/areastype.php b/admin/models/fields/areastype.php index d76fd7c..a5dcb6d 100644 --- a/admin/models/fields/areastype.php +++ b/admin/models/fields/areastype.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage areastype.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldAreastype extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create area_type @@ -146,9 +152,9 @@ class JFormFieldAreastype extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index a85a091..44a32b4 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage articles.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldArticles extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 8fe1d43..9166128 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage countries.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldCountries extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index e8a2bf0..b436e21 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage currency.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldCurrency extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/facilities.php b/admin/models/fields/facilities.php index 9217bc8..bebaa5c 100644 --- a/admin/models/fields/facilities.php +++ b/admin/models/fields/facilities.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage facilities.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldFacilities extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create facility @@ -146,9 +152,9 @@ class JFormFieldFacilities extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/facilitiestype.php b/admin/models/fields/facilitiestype.php index 45e6135..23777d1 100644 --- a/admin/models/fields/facilitiestype.php +++ b/admin/models/fields/facilitiestype.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage facilitiestype.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldFacilitiestype extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create facility_type @@ -146,9 +152,9 @@ class JFormFieldFacilitiestype extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/infotype.php b/admin/models/fields/infotype.php index 982778c..5ab7a63 100644 --- a/admin/models/fields/infotype.php +++ b/admin/models/fields/infotype.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage infotype.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldInfotype extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create info_type @@ -146,9 +152,9 @@ class JFormFieldInfotype extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/regions.php b/admin/models/fields/regions.php index 6af7992..8be4026 100644 --- a/admin/models/fields/regions.php +++ b/admin/models/fields/regions.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage regions.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldRegions extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create region @@ -146,9 +152,9 @@ class JFormFieldRegions extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 6b91747..5eb9710 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage siteviewfolderlist.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -45,9 +45,9 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { // get custom folder files $localfolder = JPATH_COMPONENT_SITE.'/views'; diff --git a/admin/models/fields/supportgroups.php b/admin/models/fields/supportgroups.php index b0b2552..416f4cc 100644 --- a/admin/models/fields/supportgroups.php +++ b/admin/models/fields/supportgroups.php @@ -6,21 +6,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.0.8 - @build 5th May, 2018 + @version 1.0.10 + @build 4th April, 2019 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file @@ -74,9 +74,15 @@ class JFormFieldSupportgroups extends JFormFieldList $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // only load referal if not new item. + // only load referral if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + // get the return value. + $_uri = (string) JUri::getInstance(); + $_return = urlencode(base64_encode($_uri)); + // load return value. + $ref .= '&return=' . $_return; + $refJ .= '&return=' . $_return; } $user = JFactory::getUser(); // only add if user allowed to create support_group @@ -146,9 +152,9 @@ class JFormFieldSupportgroups extends JFormFieldList /** * Method to get a list of options for a list input. * - * @return array An array of JHtml options. + * @return array An array of JHtml options. */ - public function getOptions() + protected function getOptions() { $db = JFactory::getDBO(); $query = $db->getQuery(true); diff --git a/admin/models/forms/additional_info.js b/admin/models/forms/additional_info.js index fcaae5f..30dd452 100644 --- a/admin/models/forms/additional_info.js +++ b/admin/models/forms/additional_info.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage additional_info.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/additional_info.xml b/admin/models/forms/additional_info.xml index 715581a..0e7e11d 100644 --- a/admin/models/forms/additional_info.xml +++ b/admin/models/forms/additional_info.xml @@ -127,6 +127,7 @@ description="COM_SUPPORTGROUPS_ADDITIONAL_INFO_INFO_TYPE_DESCRIPTION" class="list_class" multiple="false" + default="" button="true" /> diff --git a/admin/models/forms/area.js b/admin/models/forms/area.js index fb84444..b8e0c52 100644 --- a/admin/models/forms/area.js +++ b/admin/models/forms/area.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // Initial Script diff --git a/admin/models/forms/area.xml b/admin/models/forms/area.xml index aed61d3..9a1a674 100644 --- a/admin/models/forms/area.xml +++ b/admin/models/forms/area.xml @@ -127,6 +127,7 @@ description="COM_SUPPORTGROUPS_AREA_AREA_TYPE_DESCRIPTION" class="list_class" multiple="false" + default="" button="true" /> diff --git a/admin/models/forms/area_type.js b/admin/models/forms/area_type.js index 9428b34..e706dfc 100644 --- a/admin/models/forms/area_type.js +++ b/admin/models/forms/area_type.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage area_type.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index d155d4c..fad1c45 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage country.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/country.xml b/admin/models/forms/country.xml index 18b74d4..781d36d 100644 --- a/admin/models/forms/country.xml +++ b/admin/models/forms/country.xml @@ -127,6 +127,7 @@ description="COM_SUPPORTGROUPS_COUNTRY_CURRENCY_DESCRIPTION" class="list_class" multiple="false" + default="" required="true" /> @@ -136,6 +137,7 @@ label="COM_SUPPORTGROUPS_COUNTRY_WORLDZONE_LABEL" size="40" maxlength="50" + default="" description="COM_SUPPORTGROUPS_COUNTRY_WORLDZONE_DESCRIPTION" class="text_area" required="false" @@ -150,6 +152,7 @@ label="COM_SUPPORTGROUPS_COUNTRY_CODETHREE_LABEL" size="40" maxlength="3" + default="" description="COM_SUPPORTGROUPS_COUNTRY_CODETHREE_DESCRIPTION" class="text_area" required="true" @@ -164,6 +167,7 @@ label="COM_SUPPORTGROUPS_COUNTRY_CODETWO_LABEL" size="40" maxlength="2" + default="" description="COM_SUPPORTGROUPS_COUNTRY_CODETWO_DESCRIPTION" class="text_area" required="true" diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index f96f3fb..939b40a 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage currency.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/currency.xml b/admin/models/forms/currency.xml index 8d5e5d6..54a2c84 100644 --- a/admin/models/forms/currency.xml +++ b/admin/models/forms/currency.xml @@ -126,6 +126,7 @@ label="COM_SUPPORTGROUPS_CURRENCY_CODETHREE_LABEL" size="40" maxlength="3" + default="" description="COM_SUPPORTGROUPS_CURRENCY_CODETHREE_DESCRIPTION" class="text_area" required="true" @@ -140,6 +141,7 @@ label="COM_SUPPORTGROUPS_CURRENCY_NUMERICCODE_LABEL" size="40" maxlength="5" + default="" description="COM_SUPPORTGROUPS_CURRENCY_NUMERICCODE_DESCRIPTION" class="text_area" required="true" @@ -154,6 +156,7 @@ label="COM_SUPPORTGROUPS_CURRENCY_SYMBOL_LABEL" size="40" maxlength="7" + default="" description="COM_SUPPORTGROUPS_CURRENCY_SYMBOL_DESCRIPTION" class="text_area" required="true" @@ -176,6 +179,7 @@ name="negativestyle" label="COM_SUPPORTGROUPS_CURRENCY_NEGATIVESTYLE_LABEL" size="40" + default="" description="COM_SUPPORTGROUPS_CURRENCY_NEGATIVESTYLE_DESCRIPTION" class="text_area" required="true" @@ -189,6 +193,7 @@ name="positivestyle" label="COM_SUPPORTGROUPS_CURRENCY_POSITIVESTYLE_LABEL" size="40" + default="" description="COM_SUPPORTGROUPS_CURRENCY_POSITIVESTYLE_DESCRIPTION" class="text_area" required="true" @@ -232,6 +237,7 @@ name="thousands" label="COM_SUPPORTGROUPS_CURRENCY_THOUSANDS_LABEL" size="40" + default="" class="text_area" required="true" filter="STRING" diff --git a/admin/models/forms/facility.js b/admin/models/forms/facility.js index b47878d..dbe8ab8 100644 --- a/admin/models/forms/facility.js +++ b/admin/models/forms/facility.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage facility.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/facility.xml b/admin/models/forms/facility.xml index 7ebd4f1..cfe5285 100644 --- a/admin/models/forms/facility.xml +++ b/admin/models/forms/facility.xml @@ -127,15 +127,17 @@ description="COM_SUPPORTGROUPS_FACILITY_FACILITY_TYPE_DESCRIPTION" class="list_class" multiple="false" + default="" button="true" /> - + + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 727aacd..2d85cdf 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -5,21 +5,21 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage help_document.js - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values @@ -59,6 +59,7 @@ function vvvvvvw(location_vvvvvvw) if (location_vvvvvvw == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); + // add required attribute to admin_view field if (jform_vvvvvvwvvz_required) { updateFieldRequired('admin_view',0); @@ -67,11 +68,11 @@ function vvvvvvw(location_vvvvvvw) jQuery('#jform_admin_view').addClass('required'); jform_vvvvvvwvvz_required = false; } - } else { jQuery('#jform_admin_view').closest('.control-group').hide(); + // remove required attribute from admin_view field if (!jform_vvvvvvwvvz_required) { updateFieldRequired('admin_view',1); @@ -90,6 +91,7 @@ function vvvvvvx(location_vvvvvvx) if (location_vvvvvvx == 2) { jQuery('#jform_site_view').closest('.control-group').show(); + // add required attribute to site_view field if (jform_vvvvvvxvwa_required) { updateFieldRequired('site_view',0); @@ -98,11 +100,11 @@ function vvvvvvx(location_vvvvvvx) jQuery('#jform_site_view').addClass('required'); jform_vvvvvvxvwa_required = false; } - } else { jQuery('#jform_site_view').closest('.control-group').hide(); + // remove required attribute from site_view field if (!jform_vvvvvvxvwa_required) { updateFieldRequired('site_view',1); @@ -134,6 +136,7 @@ function vvvvvvy(type_vvvvvvy) if (type) { jQuery('#jform_url').closest('.control-group').show(); + // add required attribute to url field if (jform_vvvvvvyvwb_required) { updateFieldRequired('url',0); @@ -142,11 +145,11 @@ function vvvvvvy(type_vvvvvvy) jQuery('#jform_url').addClass('required'); jform_vvvvvvyvwb_required = false; } - } else { jQuery('#jform_url').closest('.control-group').hide(); + // remove required attribute from url field if (!jform_vvvvvvyvwb_required) { updateFieldRequired('url',1); @@ -189,6 +192,7 @@ function vvvvvvz(type_vvvvvvz) if (type) { jQuery('#jform_article').closest('.control-group').show(); + // add required attribute to article field if (jform_vvvvvvzvwc_required) { updateFieldRequired('article',0); @@ -197,11 +201,11 @@ function vvvvvvz(type_vvvvvvz) jQuery('#jform_article').addClass('required'); jform_vvvvvvzvwc_required = false; } - } else { jQuery('#jform_article').closest('.control-group').hide(); + // remove required attribute from article field if (!jform_vvvvvvzvwc_required) { updateFieldRequired('article',1); @@ -244,6 +248,7 @@ function vvvvvwa(type_vvvvvwa) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); + // add required attribute to content field if (jform_vvvvvwavwd_required) { updateFieldRequired('content',0); @@ -252,11 +257,11 @@ function vvvvvwa(type_vvvvvwa) jQuery('#jform_content').addClass('required'); jform_vvvvvwavwd_required = false; } - } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); + // remove required attribute from content field if (!jform_vvvvvwavwd_required) { updateFieldRequired('content',1); @@ -286,6 +291,7 @@ function vvvvvwb(target_vvvvvwb) if (target_vvvvvwb == 1) { jQuery('#jform_groups').closest('.control-group').show(); + // add required attribute to groups field if (jform_vvvvvwbvwe_required) { updateFieldRequired('groups',0); @@ -294,11 +300,11 @@ function vvvvvwb(target_vvvvvwb) jQuery('#jform_groups').addClass('required'); jform_vvvvvwbvwe_required = false; } - } else { jQuery('#jform_groups').closest('.control-group').hide(); + // remove required attribute from groups field if (!jform_vvvvvwbvwe_required) { updateFieldRequired('groups',1); diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index f4fcb13..ba5a904 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -109,7 +109,8 @@ description="COM_SUPPORTGROUPS_HELP_DOCUMENT_TYPE_DESCRIPTION" class="list_class" multiple="false" - required="true"> + required="true" + default=""> @@ -136,6 +137,7 @@ label="COM_SUPPORTGROUPS_HELP_DOCUMENT_LOCATION_LABEL" description="COM_SUPPORTGROUPS_HELP_DOCUMENT_LOCATION_DESCRIPTION" class="btn-group" + default="" required="true"> - get('additional_info.edit')): ?> -
+
+ get('additional_info.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'additional_information.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
- user->authorise('info_type.edit', 'com_supportgroups.info_type.' . (int)$item->info_type)): ?> -
- escape($item->info_type_name); ?> -
- -
escape($item->info_type_name); ?>
- +
+ user->authorise('info_type.edit', 'com_supportgroups.info_type.' . (int)$item->info_type)): ?> + escape($item->info_type_name); ?> + + escape($item->info_type_name); ?> + +
escape($item->details); ?> diff --git a/admin/views/additional_information/tmpl/default_foot.php b/admin/views/additional_information/tmpl/default_foot.php index 0265f5c..41e3f74 100644 --- a/admin/views/additional_information/tmpl/default_foot.php +++ b/admin/views/additional_information/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 25th October, 2017 - @created 9th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('area_type.edit')): ?> -
+
+ get('area_type.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'area_types.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
get('area_type.edit.state')) : ?> diff --git a/admin/views/area_types/tmpl/default_foot.php b/admin/views/area_types/tmpl/default_foot.php index c9d04a3..2b4e6b4 100644 --- a/admin/views/area_types/tmpl/default_foot.php +++ b/admin/views/area_types/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @first version of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('area.edit')): ?> -
+
+ get('area.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'areas.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
- user->authorise('area_type.edit', 'com_supportgroups.area_type.' . (int)$item->area_type)): ?> -
- escape($item->area_type_name); ?> -
- -
escape($item->area_type_name); ?>
- +
+ user->authorise('area_type.edit', 'com_supportgroups.area_type.' . (int)$item->area_type)): ?> + escape($item->area_type_name); ?> + + escape($item->area_type_name); ?> + +
- user->authorise('region.edit', 'com_supportgroups.region.' . (int)$item->region)): ?> -
- escape($item->region_name); ?> -
- -
escape($item->region_name); ?>
- +
+ user->authorise('region.edit', 'com_supportgroups.region.' . (int)$item->region)): ?> + escape($item->region_name); ?> + + escape($item->region_name); ?> + +
escape($item->details); ?> diff --git a/admin/views/areas/tmpl/default_foot.php b/admin/views/areas/tmpl/default_foot.php index 7cb0053..7b728ce 100644 --- a/admin/views/areas/tmpl/default_foot.php +++ b/admin/views/areas/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 32 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('country.edit')): ?> -
+
+ get('country.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'countries.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
- user->authorise('currency.edit', 'com_supportgroups.currency.' . (int)$item->currency)): ?> -
- escape($item->currency_name); ?> -
- -
escape($item->currency_name); ?>
- +
+ user->authorise('currency.edit', 'com_supportgroups.currency.' . (int)$item->currency)): ?> + escape($item->currency_name); ?> + + escape($item->currency_name); ?> + +
escape($item->worldzone); ?> diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index 754279b..7b728ce 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 4 of this MVC - @build 25th October, 2017 - @created 5th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('currency.edit')): ?> -
+
+ get('currency.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'currencies.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
escape($item->codethree); ?> diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index 9537de1..7b728ce 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 19 of this MVC - @build 25th October, 2017 - @created 8th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('facility.edit')): ?> -
+
+ get('facility.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'facilities.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
- user->authorise('facility_type.edit', 'com_supportgroups.facility_type.' . (int)$item->facility_type)): ?> -
- escape($item->facility_type_name); ?> -
- -
escape($item->facility_type_name); ?>
- +
+ user->authorise('facility_type.edit', 'com_supportgroups.facility_type.' . (int)$item->facility_type)): ?> + escape($item->facility_type_name); ?> + + escape($item->facility_type_name); ?> + +
escape($item->phone); ?> diff --git a/admin/views/facilities/tmpl/default_foot.php b/admin/views/facilities/tmpl/default_foot.php index e37624b..1d70c44 100644 --- a/admin/views/facilities/tmpl/default_foot.php +++ b/admin/views/facilities/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 13 of this MVC - @build 25th October, 2017 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('facility_type.edit')): ?> -
+
+ get('facility_type.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'facility_types.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
get('facility_type.edit.state')) : ?> diff --git a/admin/views/facility_types/tmpl/default_foot.php b/admin/views/facility_types/tmpl/default_foot.php index fa5556c..2b4e6b4 100644 --- a/admin/views/facility_types/tmpl/default_foot.php +++ b/admin/views/facility_types/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 2 of this MVC - @build 25th October, 2017 - @created 1st April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('help_document.edit')): ?> -
+
+ get('help_document.edit')): ?> escape($item->title); ?> checked_out): ?> name, $item->checked_out_time, 'help_documents.', $canCheckin); ?> -
- -
escape($item->title); ?>
- + + escape($item->title); ?> + +
type); ?> diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index a609686..1261a70 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 20 of this MVC - @build 13th April, 2018 - @created 13th July, 2015 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('info_type.edit')): ?> -
+
+ get('info_type.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'info_types.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
get('info_type.edit.state')) : ?> diff --git a/admin/views/info_types/tmpl/default_foot.php b/admin/views/info_types/tmpl/default_foot.php index 9dba096..2b4e6b4 100644 --- a/admin/views/info_types/tmpl/default_foot.php +++ b/admin/views/info_types/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 3 of this MVC - @build 25th October, 2017 - @created 2nd April, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('payment.edit')): ?> -
+
+ get('payment.edit')): ?> escape($item->support_group_name); ?> checked_out): ?> name, $item->checked_out_time, 'payments.', $canCheckin); ?> -
- -
escape($item->support_group_name); ?>
- + + escape($item->support_group_name); ?> + +
year); ?> diff --git a/admin/views/payments/tmpl/default_foot.php b/admin/views/payments/tmpl/default_foot.php index a05499b..41e3f74 100644 --- a/admin/views/payments/tmpl/default_foot.php +++ b/admin/views/payments/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 5 of this MVC - @build 27th April, 2016 - @created 6th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('region.edit')): ?> -
+
+ get('region.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'regions.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
- user->authorise('country.edit', 'com_supportgroups.country.' . (int)$item->country)): ?> -
- escape($item->country_name); ?> -
- -
escape($item->country_name); ?>
- +
+ user->authorise('country.edit', 'com_supportgroups.country.' . (int)$item->country)): ?> + escape($item->country_name); ?> + + escape($item->country_name); ?> + +
get('region.edit.state')) : ?> diff --git a/admin/views/regions/tmpl/default_foot.php b/admin/views/regions/tmpl/default_foot.php index 43564eb..62ef003 100644 --- a/admin/views/regions/tmpl/default_foot.php +++ b/admin/views/regions/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 11 of this MVC - @build 25th October, 2017 - @created 15th May, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
- get('support_group.edit')): ?> -
+
+ get('support_group.edit')): ?> escape($item->name); ?> checked_out): ?> name, $item->checked_out_time, 'support_groups.', $canCheckin); ?> -
- -
escape($item->name); ?>
- + + escape($item->name); ?> + +
escape($item->phone); ?> - user->authorise('area.edit', 'com_supportgroups.area.' . (int)$item->area)): ?> -
- escape($item->area_name); ?> -
- -
escape($item->area_name); ?>
- +
+ user->authorise('area.edit', 'com_supportgroups.area.' . (int)$item->area)): ?> + escape($item->area_name); ?> + + escape($item->area_name); ?> + +
- user->authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?> -
- escape($item->facility_name); ?> -
- -
escape($item->facility_name); ?>
- +
+ user->authorise('facility.edit', 'com_supportgroups.facility.' . (int)$item->facility)): ?> + escape($item->facility_name); ?> + + escape($item->facility_name); ?> + +
escape($item->male); ?> diff --git a/admin/views/support_groups/tmpl/default_foot.php b/admin/views/support_groups/tmpl/default_foot.php index 00eeb5f..1261a70 100644 --- a/admin/views/support_groups/tmpl/default_foot.php +++ b/admin/views/support_groups/tmpl/default_foot.php @@ -6,25 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 36 of this MVC - @build 25th October, 2017 - @created 4th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage default_foot.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); ?>
@@ -123,4 +123,4 @@ $model_behind_map = $this->getModules('behind-table','div','uk-panel');
- + diff --git a/site/views/supportgroups/view.html.php b/site/views/supportgroups/view.html.php index 4f5c8c0..d50a0e4 100644 --- a/site/views/supportgroups/view.html.php +++ b/site/views/supportgroups/view.html.php @@ -6,28 +6,25 @@ \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| + | | + |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 390 of this MVC - @build 1st April, 2017 - @created 10th March, 2016 + @version 1.0.10 + @build 4th April, 2019 + @created 24th February, 2016 @package Support Groups @subpackage view.html.php - @author Llewellyn van der Merwe + @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Support Groups - + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); - -// import Joomla view library -jimport('joomla.application.component.view'); +defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.module.helper'); /** @@ -152,7 +149,7 @@ class SupportgroupsViewSupportgroups extends JViewLegacy // Load the header checker class. require_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' ); // Initialize the header checker. - $HeaderCheck = new supportgroupsHeaderCheck; + $HeaderCheck = new supportgroupsHeaderCheck; // Load uikit options. $uikit = $this->params->get('uikit_load'); @@ -170,13 +167,13 @@ class SupportgroupsViewSupportgroups extends JViewLegacy if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { $this->document->addScript(JURI::root(true) .'/media/com_supportgroups/uikit-v2/js/uikit'.$size.'.js', (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - } + } // Add the CSS for Footable $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); $this->document->addStyleSheet(JURI::root() .'media/com_supportgroups/footable-v3/css/footable.standalone.min.css', (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the JavaScript for Footable (adding all funtions) - $this->document->addScript(JURI::root() .'media/com_supportgroups/footable-v3/js/footable.min.js', (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + $this->document->addScript(JURI::root() .'media/com_supportgroups/footable-v3/js/footable.min.js', (SupportgroupsHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); // load the meta description if ($this->params->get('menu-meta_description')) { @@ -191,7 +188,7 @@ class SupportgroupsViewSupportgroups extends JViewLegacy if ($this->params->get('robots')) { $this->document->setMetadata('robots', $this->params->get('robots')); - } + } // Add the JavaScript for JStore $this->document->addScript(JURI::root() .'media/com_supportgroups/js/jquery.json.min.js'); $this->document->addScript(JURI::root() .'media/com_supportgroups/js/jstorage.min.js'); @@ -252,7 +249,7 @@ class SupportgroupsViewSupportgroups extends JViewLegacy #global { height: 600px; } - "); + "); // Set the Custom JS script to view $this->document->addScriptDeclaration(" // Get Totals from Server diff --git a/supportgroups.xml b/supportgroups.xml index bdc1175..0adfdec 100644 --- a/supportgroups.xml +++ b/supportgroups.xml @@ -1,15 +1,15 @@ COM_SUPPORTGROUPS - 5th May, 2018 + 4th April, 2019 Llewellyn van der Merwe joomla@vdm.io http://www.vdm.io Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 1.0.8 + 1.0.10 Support Groups (v.1.0.8) +

Support Groups (v.1.0.10)

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.

Created by Llewellyn van der Merwe
Development started 24th February, 2016

@@ -53,7 +53,10 @@ controller.php index.html router.php - supportgroups.php + supportgroups.php + supportgroups.php + router.php + controller.php assets helpers controllers @@ -80,9 +83,14 @@ access.xml config.xml - controller.php###WHMCS_ENCRYPT_FILE### + controller.php index.html supportgroups.php + access.xml + config.xml + controller.php + supportgroups.php + README.txt README.txt assets controllers diff --git a/supportgroups_update_server.xml b/supportgroups_update_server.xml index 46b3bff..5f29efa 100644 --- a/supportgroups_update_server.xml +++ b/supportgroups_update_server.xml @@ -152,4 +152,38 @@ http://www.vdm.io + + Support Groups + Support Groups + com_supportgroups + component + 1.0.9 + http://www.vdm.io + + http://domain.com/demo.zip + + + stable + + Llewellyn van der Merwe + http://www.vdm.io + + + + Support Groups + Support Groups + com_supportgroups + component + 1.0.10 + http://www.vdm.io + + http://domain.com/demo.zip + + + stable + + Llewellyn van der Merwe + http://www.vdm.io + + \ No newline at end of file