From c821474e7deb946e1f7ce116888bf07f9a161fa7 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 23 Apr 2019 22:37:57 +0200 Subject: [PATCH] Updated with JCB v2.9.15 --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/look.css | 2 +- admin/assets/css/looks.css | 2 +- admin/assets/js/admin.js | 2 +- admin/controller.php | 2 +- admin/controllers/demo.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/look.php | 2 +- admin/controllers/looks.php | 2 +- admin/demo.php | 2 +- admin/helpers/demo.php | 464 +++++++++--------- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/language/en-GB/en-GB.com_demo.sys.ini | 2 +- admin/layouts/batchselection.php | 2 +- admin/layouts/look/details_above.php | 15 +- admin/layouts/look/details_fullwidth.php | 20 +- admin/layouts/look/details_under.php | 15 +- admin/layouts/look/metadata.php | 2 +- admin/layouts/look/more_left.php | 26 +- admin/layouts/look/more_right.php | 26 +- admin/layouts/look/publishing.php | 27 +- admin/models/demo.php | 2 +- admin/models/forms/look.js | 2 +- admin/models/forms/look.xml | 5 +- admin/models/import.php | 2 +- admin/models/look.php | 2 +- admin/models/looks.php | 2 +- admin/sql/install.mysql.utf8.sql | 11 +- admin/tables/look.php | 4 +- admin/views/demo/tmpl/default.php | 2 +- admin/views/demo/tmpl/default_main.php | 2 +- admin/views/demo/tmpl/default_vdm.php | 2 +- admin/views/demo/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/look/submitbutton.js | 16 +- admin/views/look/tmpl/edit.php | 4 +- admin/views/look/view.html.php | 6 +- admin/views/looks/tmpl/default.php | 2 +- admin/views/looks/tmpl/default_batch_body.php | 2 +- .../views/looks/tmpl/default_batch_footer.php | 2 +- admin/views/looks/tmpl/default_body.php | 2 +- admin/views/looks/tmpl/default_foot.php | 2 +- admin/views/looks/tmpl/default_head.php | 2 +- admin/views/looks/tmpl/default_toolbar.php | 2 +- admin/views/looks/view.html.php | 4 +- demo.xml | 14 +- .../css/components/accordion.almost-flat.css | 2 +- .../components/accordion.almost-flat.min.css | 2 +- media/uikit-v2/css/components/accordion.css | 2 +- .../css/components/accordion.gradient.css | 2 +- .../css/components/accordion.gradient.min.css | 2 +- .../uikit-v2/css/components/accordion.min.css | 2 +- .../components/autocomplete.almost-flat.css | 2 +- .../autocomplete.almost-flat.min.css | 2 +- .../uikit-v2/css/components/autocomplete.css | 2 +- .../css/components/autocomplete.gradient.css | 2 +- .../components/autocomplete.gradient.min.css | 2 +- .../css/components/autocomplete.min.css | 2 +- .../css/components/datepicker.almost-flat.css | 2 +- .../components/datepicker.almost-flat.min.css | 2 +- media/uikit-v2/css/components/datepicker.css | 2 +- .../css/components/datepicker.gradient.css | 2 +- .../components/datepicker.gradient.min.css | 2 +- .../css/components/datepicker.min.css | 2 +- .../css/components/dotnav.almost-flat.css | 2 +- .../css/components/dotnav.almost-flat.min.css | 2 +- media/uikit-v2/css/components/dotnav.css | 2 +- .../css/components/dotnav.gradient.css | 2 +- .../css/components/dotnav.gradient.min.css | 2 +- media/uikit-v2/css/components/dotnav.min.css | 2 +- .../components/form-advanced.almost-flat.css | 2 +- .../form-advanced.almost-flat.min.css | 2 +- .../uikit-v2/css/components/form-advanced.css | 2 +- .../css/components/form-advanced.gradient.css | 2 +- .../components/form-advanced.gradient.min.css | 2 +- .../css/components/form-advanced.min.css | 2 +- .../css/components/form-file.almost-flat.css | 2 +- .../components/form-file.almost-flat.min.css | 2 +- media/uikit-v2/css/components/form-file.css | 2 +- .../css/components/form-file.gradient.css | 2 +- .../css/components/form-file.gradient.min.css | 2 +- .../uikit-v2/css/components/form-file.min.css | 2 +- .../components/form-password.almost-flat.css | 2 +- .../form-password.almost-flat.min.css | 2 +- .../uikit-v2/css/components/form-password.css | 2 +- .../css/components/form-password.gradient.css | 2 +- .../components/form-password.gradient.min.css | 2 +- .../css/components/form-password.min.css | 2 +- .../components/form-select.almost-flat.css | 2 +- .../form-select.almost-flat.min.css | 2 +- media/uikit-v2/css/components/form-select.css | 2 +- .../css/components/form-select.gradient.css | 2 +- .../components/form-select.gradient.min.css | 2 +- .../css/components/form-select.min.css | 2 +- .../css/components/htmleditor.almost-flat.css | 2 +- .../components/htmleditor.almost-flat.min.css | 2 +- media/uikit-v2/css/components/htmleditor.css | 2 +- .../css/components/htmleditor.gradient.css | 2 +- .../components/htmleditor.gradient.min.css | 2 +- .../css/components/htmleditor.min.css | 2 +- .../css/components/nestable.almost-flat.css | 2 +- .../components/nestable.almost-flat.min.css | 2 +- media/uikit-v2/css/components/nestable.css | 2 +- .../css/components/nestable.gradient.css | 2 +- .../css/components/nestable.gradient.min.css | 2 +- .../uikit-v2/css/components/nestable.min.css | 2 +- .../css/components/notify.almost-flat.css | 2 +- .../css/components/notify.almost-flat.min.css | 2 +- media/uikit-v2/css/components/notify.css | 2 +- .../css/components/notify.gradient.css | 2 +- .../css/components/notify.gradient.min.css | 2 +- media/uikit-v2/css/components/notify.min.css | 2 +- .../components/placeholder.almost-flat.css | 2 +- .../placeholder.almost-flat.min.css | 2 +- media/uikit-v2/css/components/placeholder.css | 2 +- .../css/components/placeholder.gradient.css | 2 +- .../components/placeholder.gradient.min.css | 2 +- .../css/components/placeholder.min.css | 2 +- .../css/components/progress.almost-flat.css | 2 +- .../components/progress.almost-flat.min.css | 2 +- media/uikit-v2/css/components/progress.css | 2 +- .../css/components/progress.gradient.css | 2 +- .../css/components/progress.gradient.min.css | 2 +- .../uikit-v2/css/components/progress.min.css | 2 +- .../css/components/search.almost-flat.css | 2 +- .../css/components/search.almost-flat.min.css | 2 +- media/uikit-v2/css/components/search.css | 2 +- .../css/components/search.gradient.css | 2 +- .../css/components/search.gradient.min.css | 2 +- media/uikit-v2/css/components/search.min.css | 2 +- .../css/components/slidenav.almost-flat.css | 2 +- .../components/slidenav.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slidenav.css | 2 +- .../css/components/slidenav.gradient.css | 2 +- .../css/components/slidenav.gradient.min.css | 2 +- .../uikit-v2/css/components/slidenav.min.css | 2 +- .../css/components/slider.almost-flat.css | 2 +- .../css/components/slider.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slider.css | 2 +- .../css/components/slider.gradient.css | 2 +- .../css/components/slider.gradient.min.css | 2 +- media/uikit-v2/css/components/slider.min.css | 2 +- .../css/components/slideshow.almost-flat.css | 2 +- .../components/slideshow.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slideshow.css | 2 +- .../css/components/slideshow.gradient.css | 2 +- .../css/components/slideshow.gradient.min.css | 2 +- .../uikit-v2/css/components/slideshow.min.css | 2 +- .../css/components/sortable.almost-flat.css | 2 +- .../components/sortable.almost-flat.min.css | 2 +- media/uikit-v2/css/components/sortable.css | 2 +- .../css/components/sortable.gradient.css | 2 +- .../css/components/sortable.gradient.min.css | 2 +- .../uikit-v2/css/components/sortable.min.css | 2 +- .../css/components/sticky.almost-flat.css | 2 +- .../css/components/sticky.almost-flat.min.css | 2 +- media/uikit-v2/css/components/sticky.css | 2 +- .../css/components/sticky.gradient.css | 2 +- .../css/components/sticky.gradient.min.css | 2 +- media/uikit-v2/css/components/sticky.min.css | 2 +- .../css/components/tooltip.almost-flat.css | 2 +- .../components/tooltip.almost-flat.min.css | 2 +- media/uikit-v2/css/components/tooltip.css | 2 +- .../css/components/tooltip.gradient.css | 2 +- .../css/components/tooltip.gradient.min.css | 2 +- media/uikit-v2/css/components/tooltip.min.css | 2 +- .../css/components/upload.almost-flat.css | 2 +- .../css/components/upload.almost-flat.min.css | 2 +- media/uikit-v2/css/components/upload.css | 2 +- .../css/components/upload.gradient.css | 2 +- .../css/components/upload.gradient.min.css | 2 +- media/uikit-v2/css/components/upload.min.css | 2 +- media/uikit-v2/css/uikit.almost-flat.css | 2 +- media/uikit-v2/css/uikit.almost-flat.min.css | 2 +- media/uikit-v2/css/uikit.css | 2 +- media/uikit-v2/css/uikit.gradient.css | 2 +- media/uikit-v2/css/uikit.gradient.min.css | 2 +- media/uikit-v2/css/uikit.min.css | 2 +- media/uikit-v2/js/components/accordion.js | 2 +- media/uikit-v2/js/components/accordion.min.js | 2 +- media/uikit-v2/js/components/autocomplete.js | 2 +- .../js/components/autocomplete.min.js | 2 +- media/uikit-v2/js/components/datepicker.js | 2 +- .../uikit-v2/js/components/datepicker.min.js | 2 +- media/uikit-v2/js/components/form-password.js | 2 +- .../js/components/form-password.min.js | 2 +- media/uikit-v2/js/components/form-select.js | 2 +- .../uikit-v2/js/components/form-select.min.js | 2 +- media/uikit-v2/js/components/grid-parallax.js | 2 +- .../js/components/grid-parallax.min.js | 2 +- media/uikit-v2/js/components/grid.js | 239 +-------- media/uikit-v2/js/components/grid.min.js | 4 +- media/uikit-v2/js/components/htmleditor.js | 2 +- .../uikit-v2/js/components/htmleditor.min.js | 2 +- media/uikit-v2/js/components/lightbox.js | 2 +- media/uikit-v2/js/components/lightbox.min.js | 2 +- media/uikit-v2/js/components/nestable.js | 16 +- media/uikit-v2/js/components/nestable.min.js | 4 +- media/uikit-v2/js/components/notify.js | 2 +- media/uikit-v2/js/components/notify.min.js | 2 +- media/uikit-v2/js/components/pagination.js | 2 +- .../uikit-v2/js/components/pagination.min.js | 2 +- media/uikit-v2/js/components/parallax.js | 2 +- media/uikit-v2/js/components/parallax.min.js | 2 +- media/uikit-v2/js/components/search.js | 2 +- media/uikit-v2/js/components/search.min.js | 2 +- media/uikit-v2/js/components/slider.js | 2 +- media/uikit-v2/js/components/slider.min.js | 2 +- media/uikit-v2/js/components/slideset.js | 2 +- media/uikit-v2/js/components/slideset.min.js | 2 +- media/uikit-v2/js/components/slideshow-fx.js | 2 +- .../js/components/slideshow-fx.min.js | 2 +- media/uikit-v2/js/components/slideshow.js | 2 +- media/uikit-v2/js/components/slideshow.min.js | 2 +- media/uikit-v2/js/components/sortable.js | 24 +- media/uikit-v2/js/components/sortable.min.js | 4 +- media/uikit-v2/js/components/sticky.js | 2 +- media/uikit-v2/js/components/sticky.min.js | 2 +- media/uikit-v2/js/components/timepicker.js | 2 +- .../uikit-v2/js/components/timepicker.min.js | 2 +- media/uikit-v2/js/components/tooltip.js | 2 +- media/uikit-v2/js/components/tooltip.min.js | 2 +- media/uikit-v2/js/components/upload.js | 2 +- media/uikit-v2/js/components/upload.min.js | 2 +- media/uikit-v2/js/core/alert.js | 2 +- media/uikit-v2/js/core/alert.min.js | 2 +- media/uikit-v2/js/core/button.js | 2 +- media/uikit-v2/js/core/button.min.js | 2 +- media/uikit-v2/js/core/core.js | 4 +- media/uikit-v2/js/core/core.min.js | 4 +- media/uikit-v2/js/core/cover.js | 2 +- media/uikit-v2/js/core/cover.min.js | 2 +- media/uikit-v2/js/core/dropdown.js | 2 +- media/uikit-v2/js/core/dropdown.min.js | 2 +- media/uikit-v2/js/core/grid.js | 2 +- media/uikit-v2/js/core/grid.min.js | 2 +- media/uikit-v2/js/core/modal.js | 8 +- media/uikit-v2/js/core/modal.min.js | 4 +- media/uikit-v2/js/core/nav.js | 2 +- media/uikit-v2/js/core/nav.min.js | 2 +- media/uikit-v2/js/core/offcanvas.js | 6 +- media/uikit-v2/js/core/offcanvas.min.js | 4 +- media/uikit-v2/js/core/scrollspy.js | 2 +- media/uikit-v2/js/core/scrollspy.min.js | 2 +- media/uikit-v2/js/core/smooth-scroll.js | 2 +- media/uikit-v2/js/core/smooth-scroll.min.js | 2 +- media/uikit-v2/js/core/switcher.js | 2 +- media/uikit-v2/js/core/switcher.min.js | 2 +- media/uikit-v2/js/core/tab.js | 2 +- media/uikit-v2/js/core/tab.min.js | 2 +- media/uikit-v2/js/core/toggle.js | 2 +- media/uikit-v2/js/core/toggle.min.js | 2 +- media/uikit-v2/js/core/touch.js | 2 +- media/uikit-v2/js/core/touch.min.js | 2 +- media/uikit-v2/js/core/utility.js | 2 +- media/uikit-v2/js/core/utility.min.js | 2 +- media/uikit-v2/js/uikit.js | 14 +- media/uikit-v2/js/uikit.min.js | 6 +- script.php | 6 +- site/assets/css/look.css | 2 +- site/assets/css/looking.css | 2 +- site/assets/css/looks.css | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/controller.php | 2 +- site/controllers/look.php | 2 +- site/demo.php | 2 +- site/helpers/category.php | 2 +- site/helpers/demo.php | 462 ++++++++--------- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 37 +- site/layouts/look/details_above.php | 15 +- site/layouts/look/details_fullwidth.php | 20 +- site/layouts/look/details_under.php | 15 +- site/layouts/look/metadata.php | 2 +- site/layouts/look/more_left.php | 26 +- site/layouts/look/more_right.php | 26 +- site/layouts/look/publishing.php | 27 +- site/models/forms/look.js | 2 +- site/models/forms/look.xml | 5 +- site/models/look.php | 2 +- site/models/looking.php | 2 +- site/models/looks.php | 18 +- site/router.php | 2 +- site/views/look/submitbutton.js | 16 +- site/views/look/tmpl/edit.php | 4 +- site/views/look/view.html.php | 23 +- site/views/looking/tmpl/default.php | 2 +- site/views/looking/view.html.php | 2 +- site/views/looks/tmpl/default.php | 2 +- site/views/looks/view.html.php | 2 +- 296 files changed, 987 insertions(+), 1221 deletions(-) diff --git a/README.md b/README.md index 4302fe3..4de404a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla](http://www.j + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Demo](https://www.vdm.io/) + *First Build*: 18th October, 2016 -+ *Last Build*: 13th September, 2018 ++ *Last Build*: 23rd April, 2019 + *Version*: 2.0.0 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -23,7 +23,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **14920** ++ *Line count*: **14891** + *File count*: **147** + *Folder count*: **54** diff --git a/admin/README.txt b/admin/README.txt index 4302fe3..4de404a 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla](http://www.j + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Demo](https://www.vdm.io/) + *First Build*: 18th October, 2016 -+ *Last Build*: 13th September, 2018 ++ *Last Build*: 23rd April, 2019 + *Version*: 2.0.0 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -23,7 +23,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **14920** ++ *Line count*: **14891** + *File count*: **147** + *Folder count*: **54** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 67a1654..7108499 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 7f8d052..76239c3 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage dashboard.css diff --git a/admin/assets/css/look.css b/admin/assets/css/look.css index 2f65d91..361bec6 100644 --- a/admin/assets/css/look.css +++ b/admin/assets/css/look.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage look.css diff --git a/admin/assets/css/looks.css b/admin/assets/css/looks.css index fa8b092..5b263d7 100644 --- a/admin/assets/css/looks.css +++ b/admin/assets/css/looks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage looks.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index d082e91..e45361a 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index e58031a..711f376 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage controller.php diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php index 0d67c57..e48bf49 100644 --- a/admin/controllers/demo.php +++ b/admin/controllers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index a008ab5..d190314 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage import.php diff --git a/admin/controllers/look.php b/admin/controllers/look.php index 985d875..8520294 100644 --- a/admin/controllers/look.php +++ b/admin/controllers/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage look.php diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php index b05e619..e5ad993 100644 --- a/admin/controllers/looks.php +++ b/admin/controllers/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage looks.php diff --git a/admin/demo.php b/admin/demo.php index 9b3733c..fbaec07 100644 --- a/admin/demo.php +++ b/admin/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php index 5fa11b7..11b82c6 100644 --- a/admin/helpers/demo.php +++ b/admin/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage demo.php @@ -27,7 +27,7 @@ defined('_JEXEC') or die('Restricted access'); abstract class DemoHelper { /** - * Load the Component xml manifest. + * Load the Component xml manifest. **/ public static function manifest() { @@ -36,12 +36,12 @@ abstract class DemoHelper } /** - * Joomla version object + * Joomla version object **/ protected static $JVersion; /** - * set/get Joomla version + * set/get Joomla version **/ public static function jVersion() { @@ -54,7 +54,7 @@ abstract class DemoHelper } /** - * Load the Contributors details. + * Load the Contributors details. **/ public static function getContributors() { @@ -100,7 +100,7 @@ abstract class DemoHelper } /** - * Configure the Linkbar. + * Configure the Linkbar. **/ public static function addSubmenu($submenu) { @@ -602,183 +602,149 @@ abstract class DemoHelper } /** - * 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 = 'demo') { - 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_demo', '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_demo.'.$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_demo.'.$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_demo.'.$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_demo')) - { - // 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_demo')) - { - // 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_demo.'.$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_demo.'.$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_demo.'.$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_demo')) - { - // 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_demo')) - { - // 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; } } } @@ -787,14 +753,49 @@ abstract class DemoHelper // if allowed then fallback on component global settings if ($fallback) { - $result->set($action->name, $user->authorise($action->name, 'com_demo')); + // 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 = 'Demo', $config = array()) { @@ -838,9 +839,9 @@ abstract class DemoHelper } /** - * 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_demo'); @@ -872,7 +873,7 @@ abstract class DemoHelper $asset->name = $name; $asset->title = $title; // get the default asset rules - $rules = self::getDefaultAssetRules('com_demo',$table); + $rules = self::getDefaultAssetRules('com_demo', $table, $inherit); if ($rules instanceof JAccessRules) { $asset->rules = (string) $rules; @@ -900,55 +901,62 @@ abstract class DemoHelper } /** - * 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((array)$_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; } /** @@ -1117,11 +1125,11 @@ abstract class DemoHelper } /** - * 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) { @@ -1134,11 +1142,11 @@ abstract class DemoHelper } /** - * 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) { @@ -1150,15 +1158,15 @@ abstract class DemoHelper } /** - * 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)$array) > 0) + if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0) { // also make sure the empty strings are removed if ($removeEmptyString) @@ -1172,17 +1180,17 @@ abstract class DemoHelper } 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) { @@ -1194,10 +1202,10 @@ abstract class DemoHelper } /** - * 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() { @@ -1219,11 +1227,11 @@ abstract class DemoHelper } /** - * 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) { @@ -1249,11 +1257,11 @@ abstract class DemoHelper } /** - * 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) { @@ -1290,11 +1298,11 @@ abstract class DemoHelper } /** - * 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, $keepOnlyCharacters = true) { @@ -1434,11 +1442,11 @@ abstract class DemoHelper } /** - * 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) { @@ -1525,9 +1533,9 @@ abstract class DemoHelper } /** - * Random Key + * Random Key * - * @returns a string + * @returns a string **/ public static function randomkey($size) { diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index ea4b931..a8b008a 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 5533776..fb1dab5 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage batch_.php diff --git a/admin/language/en-GB/en-GB.com_demo.sys.ini b/admin/language/en-GB/en-GB.com_demo.sys.ini index a487bf9..a84fb08 100644 --- a/admin/language/en-GB/en-GB.com_demo.sys.ini +++ b/admin/language/en-GB/en-GB.com_demo.sys.ini @@ -44,7 +44,7 @@ COM_DEMO_LOOKS_IMPORT="Looks Import" COM_DEMO_LOOKS_IMPORT_DESC="Allows the users in this group to import import looks" COM_DEMO_LOOKS_SUBMENU="Looks Submenu" COM_DEMO_LOOKS_SUBMENU_DESC="Allows the users in this group to submenu of look" -COM_DEMO_MENU="» Demo" +COM_DEMO_MENU="Demo" COM_DEMO_MENU_LOOKS="Looks" COM_DEMO_MENU_LOOKS_DESC="The List of all published looks" COM_DEMO_MENU_LOOKS_OPTION="Looks" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 56e6e5b..09b2681 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage batchselection.php diff --git a/admin/layouts/look/details_above.php b/admin/layouts/look/details_above.php index 50cd9e2..690d478 100644 --- a/admin/layouts/look/details_above.php +++ b/admin/layouts/look/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage details_above.php @@ -23,14 +23,19 @@ 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/look/details_fullwidth.php b/admin/layouts/look/details_fullwidth.php index 70f20f9..930e052 100644 --- a/admin/layouts/look/details_fullwidth.php +++ b/admin/layouts/look/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage details_fullwidth.php @@ -27,16 +27,14 @@ $fields = $displayData->get('fields') ?: array( 'description' ); +$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/look/details_under.php b/admin/layouts/look/details_under.php index 90565f7..5a217a5 100644 --- a/admin/layouts/look/details_under.php +++ b/admin/layouts/look/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage details_under.php @@ -23,13 +23,18 @@ 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/look/metadata.php b/admin/layouts/look/metadata.php index 53726f0..b7d05bd 100644 --- a/admin/layouts/look/metadata.php +++ b/admin/layouts/look/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage metadata.php diff --git a/admin/layouts/look/more_left.php b/admin/layouts/look/more_left.php index 0b3bcd7..63681a4 100644 --- a/admin/layouts/look/more_left.php +++ b/admin/layouts/look/more_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage more_left.php @@ -29,20 +29,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/look/more_right.php b/admin/layouts/look/more_right.php index 86cde4e..0c1d12f 100644 --- a/admin/layouts/look/more_right.php +++ b/admin/layouts/look/more_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage more_right.php @@ -33,20 +33,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/look/publishing.php b/admin/layouts/look/publishing.php index 117a936..96b3d30 100644 --- a/admin/layouts/look/publishing.php +++ b/admin/layouts/look/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage publishing.php @@ -21,7 +21,6 @@ // 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 +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/models/demo.php b/admin/models/demo.php index 09b9e24..0c319e8 100644 --- a/admin/models/demo.php +++ b/admin/models/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage demo.php diff --git a/admin/models/forms/look.js b/admin/models/forms/look.js index 14e706b..6d9400c 100644 --- a/admin/models/forms/look.js +++ b/admin/models/forms/look.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage look.js diff --git a/admin/models/forms/look.xml b/admin/models/forms/look.xml index 8a85098..6a8a9ee 100644 --- a/admin/models/forms/look.xml +++ b/admin/models/forms/look.xml @@ -167,13 +167,14 @@ minyear="-120" maxyear="-1" /> - + loadResult(); - return JAccess::getAssetRules($assetId); + return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } // try again elseif ($try) diff --git a/admin/views/demo/tmpl/default.php b/admin/views/demo/tmpl/default.php index 557d4e0..3cc119c 100644 --- a/admin/views/demo/tmpl/default.php +++ b/admin/views/demo/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/admin/views/demo/tmpl/default_main.php b/admin/views/demo/tmpl/default_main.php index c034793..1952195 100644 --- a/admin/views/demo/tmpl/default_main.php +++ b/admin/views/demo/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage default_main.php diff --git a/admin/views/demo/tmpl/default_vdm.php b/admin/views/demo/tmpl/default_vdm.php index 8caa2ab..44cafb8 100644 --- a/admin/views/demo/tmpl/default_vdm.php +++ b/admin/views/demo/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage default_vdm.php diff --git a/admin/views/demo/view.html.php b/admin/views/demo/view.html.php index abde8cd..2b3b8fd 100644 --- a/admin/views/demo/view.html.php +++ b/admin/views/demo/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 5ef9e6c..f3dbc39 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index de383f3..87b252c 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage view.html.php diff --git a/admin/views/look/submitbutton.js b/admin/views/look/submitbutton.js index 5013c59..2041cca 100644 --- a/admin/views/look/submitbutton.js +++ b/admin/views/look/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 2.0.0 - @build 13th September, 2018 + @build 23rd April, 2019 @created 18th October, 2016 @package Demo @subpackage submitbutton.js @@ -22,19 +22,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;iparams; // will be removed just use $this->params instead ?>